Fix mbean not found issue

Author: yifan-c

src/java/org/apache/cassandra/db/compression/CompressionDictionaryManager.java

@@ -316,7 +316,7 @@ private void unregisterMbean()
         if (mbeanRegistered)
         {
             MBeanWrapper.instance.unregisterMBean(mbeanName(keyspaceName, tableName), OnException.IGNORE);
-            mbeanRegistered = true;
+            mbeanRegistered = false;
         }
     }
 

src/java/org/apache/cassandra/tools/nodetool/TrainCompressionDictionary.java

@@ -61,6 +61,7 @@ public void execute(NodeProbe probe)
             {
                 TrainingState trainingState = probe.getCompressionDictionaryTrainingState(keyspace, table);
                 TrainingStatus status = trainingState.getStatus();
+                displayProgress(trainingState, startTime, out, status);
                 if (TrainingStatus.COMPLETED == status)
                 {
                     out.printf("%nTraining completed successfully for %s.%s%n", keyspace, table);
@@ -84,16 +85,7 @@ else if (TrainingStatus.FAILED == status)
                     System.exit(1);
                 }
 
-                // Display meaningful statistics
-                long sampleCount = trainingState.getSampleCount();
-                long totalSampleSize = trainingState.getTotalSampleSize();
-                long elapsedSeconds = (Clock.Global.currentTimeMillis() - startTime) / 1000;
-                double sampleSizeMB = totalSampleSize / (1024.0 * 1024.0);
-
-                out.printf("\rStatus: %s | Samples: %d | Size: %.2f MiB | Elapsed: %ds",
-                           status, sampleCount, sampleSizeMB, elapsedSeconds);
-
-                Uninterruptibles.sleepUninterruptibly(2, TimeUnit.SECONDS);
+                Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
             }
 
             err.printf("%nTraining did not complete within expected timeframe (10 minutes).%n");
@@ -105,4 +97,16 @@ else if (TrainingStatus.FAILED == status)
             System.exit(1);
         }
     }
+
+    private static void displayProgress(TrainingState trainingState, long startTime, PrintStream out, TrainingStatus status)
+    {
+        // Display meaningful statistics
+        long sampleCount = trainingState.getSampleCount();
+        long totalSampleSize = trainingState.getTotalSampleSize();
+        long elapsedSeconds = (Clock.Global.currentTimeMillis() - startTime) / 1000;
+        double sampleSizeMB = totalSampleSize / (1024.0 * 1024.0);
+
+        out.printf("\rStatus: %s | Samples: %d | Size: %.2f MiB | Elapsed: %ds",
+                   status, sampleCount, sampleSizeMB, elapsedSeconds);
+    }
 }