Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix effective ownership in Nodetool Status and Ring #609

Open
wants to merge 1 commit into
base: palantir-cassandra-2.2.18
Choose a base branch
from
Open

Fix effective ownership in Nodetool Status and Ring #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/java/com/palantir/cassandra/db/SystemPalantir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.palantir.cassandra.db;

final public class SystemPalantir
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

{
public static final String NAME = "system_palantir";

private SystemPalantir()
{
}
}
4 changes: 2 additions & 2 deletions src/java/org/apache/cassandra/config/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.security.NoSuchAlgorithmException;
import java.util.*;

import com.palantir.logsafe.SafeArg;
import com.palantir.cassandra.db.SystemPalantir;
import com.palantir.tracing.CloseableTracer;

import com.google.common.base.Splitter;
Expand Down Expand Up @@ -60,7 +60,7 @@ public class Schema
Splitter.on(",").splitToList(System.getProperty("palantir_cassandra.additional_system_keyspaces", "")));
public static final Set<String> SYSTEM_KEYSPACES = ImmutableSet.<String>builder()
.add(SystemKeyspace.NAME, SystemDistributedKeyspace.NAME, TraceKeyspace.NAME, AuthKeyspace.NAME)
.add("system_palantir")
.add(SystemPalantir.NAME)
.addAll(additionalSystemKeyspaces)
.build();

Expand Down
8 changes: 6 additions & 2 deletions src/java/org/apache/cassandra/service/StorageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.google.common.collect.*;
import com.google.common.util.concurrent.*;
import com.palantir.cassandra.db.BootstrappingSafetyException;
import com.palantir.cassandra.db.SystemPalantir;
import com.palantir.cassandra.settings.LocalQuorumReadForSerialCasSetting;
import com.palantir.cassandra.utils.SchemaAgreementCheck;
import com.palantir.logsafe.Safe;
Expand Down Expand Up @@ -4900,8 +4901,11 @@ public LinkedHashMap<InetAddress, Float> effectiveOwnership(String keyspace) thr
else
{
List<String> userKeyspaces = Schema.instance.getUserKeyspaces();

if (userKeyspaces.size() > 0)
if (Schema.instance.getKeyspaceInstance(SystemPalantir.NAME) != null)
{
keyspace = SystemPalantir.NAME;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of modifying it here (I feel it might be confusing if we use this functions in other pieces of the code), wanna add to theStatus class instead: ownerships = probe.effectiveOwnership(keyspace != null ? keyspace: SystemPalantir.NAME); and add a small comment on why we are doing this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the correct place for this logic because this method already contains logic to auto resolve a keyspace if none is provided

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, adding the system_palantir keyspace name as the argument to effectiveOwnership isn't great because then the method would throw in the case that system_palantir is not present, whereas in my patch it would instead fall back to the existing behavior.

else if (userKeyspaces.size() > 0)
{
keyspace = userKeyspaces.iterator().next();
AbstractReplicationStrategy replicationStrategy = Schema.instance.getKeyspaceInstance(keyspace).getReplicationStrategy();
Expand Down