Review feedback part 3

datastax · Nov 18, 2024 · 7d66dc1 · 7d66dc1
1 parent 95235de
commit 7d66dc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/java/org/apache/cassandra/nodes/virtual/LegacySystemKeyspaceToNodes.java b/src/java/org/apache/cassandra/nodes/virtual/LegacySystemKeyspaceToNodes.java
@@ -88,12 +88,8 @@ public static void convertToNodesFilesIfNecessary()
     {
         try
         {
-            if (Nodes.local().localInfoWasPresent())
-            {
-                return;
-            }
-
-            new LegacySystemKeyspaceToNodes(Nodes.nodes()).convertToNodesFiles();
+            if (!Nodes.local().localInfoWasPresent())
+                new LegacySystemKeyspaceToNodes(Nodes.nodes()).convertToNodesFiles();
         }
         catch (Exception e)
         {
@@ -109,6 +105,7 @@ public LegacySystemKeyspaceToNodes(Nodes nodes)
     @VisibleForTesting
     void convertToNodesFiles()
     {
+        assert ! isRunning.get();
         isRunning.set(true);
         try
         {

diff --git a/src/java/org/apache/cassandra/nodes/virtual/NodeConstants.java b/src/java/org/apache/cassandra/nodes/virtual/NodeConstants.java
@@ -48,9 +48,7 @@ public static boolean canBeMapped(String keyspace, String table)
         if (keyspace.equals(SchemaConstants.SYSTEM_KEYSPACE_NAME))
         {
             if (table.equals(LOCAL) || table.equals(LEGACY_PEERS))
-            {
                 return !LegacySystemKeyspaceToNodes.isRunning();
-            }
             return ALL_TABLES.contains(table);
         }
         return false;