IGNITE-6583 Proper getters for rebalance metrics were added; ignite-style getters (without get) were deprecated

Signed-off-by: Andrey Gura <[email protected]>

Author: sergey-chugunov-1985

modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java

@@ -506,15 +506,35 @@ public interface CacheMetrics {
     public long getRebalancingBytesRate();
 
     /**
+     * This method is deprecated and will be deleted in future major release.
+     *
+     * Use {@link #getEstimatedRebalancingFinishTime()} instead.
+     *
      * @return Estimated rebalancing finished time.
      */
+    @Deprecated
     public long estimateRebalancingFinishTime();
 
     /**
+     * This method is deprecated and will be deleted in future major release.
+     *
+     * Use {@link #getRebalancingStartTime()} instead.
+     *
      * @return Rebalancing start time.
      */
+    @Deprecated
     public long rebalancingStartTime();
 
+    /**
+     * @return Estimated rebalancing finish time.
+     */
+    public long getEstimatedRebalancingFinishTime();
+
+    /**
+     * @return Rebalancing start time.
+     */
+    public long getRebalancingStartTime();
+
     /**
      * Checks whether statistics collection is enabled in this cache.
      * <p>

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java

@@ -392,4 +392,14 @@ class CacheClusterMetricsMXBeanImpl implements CacheMetricsMXBean {
     @Override public long rebalancingStartTime() {
         return cache.clusterMetrics().rebalancingStartTime();
     }
+
+    /** {@inheritDoc} */
+    @Override public long getEstimatedRebalancingFinishTime() {
+        return cache.clusterMetrics().getEstimatedRebalancingFinishTime();
+    }
+
+    /** {@inheritDoc} */
+    @Override public long getRebalancingStartTime() {
+        return cache.clusterMetrics().getRebalancingStartTime();
+    }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLocalMetricsMXBeanImpl.java

@@ -392,4 +392,14 @@ class CacheLocalMetricsMXBeanImpl implements CacheMetricsMXBean {
     @Override public long rebalancingStartTime() {
         return cache.metrics0().rebalancingStartTime();
     }
+
+    /** {@inheritDoc} */
+    @Override public long getEstimatedRebalancingFinishTime() {
+        return cache.metrics0().getEstimatedRebalancingFinishTime();
+    }
+
+    /** {@inheritDoc} */
+    @Override public long getRebalancingStartTime() {
+        return cache.metrics0().getRebalancingStartTime();
+    }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java

@@ -808,14 +808,24 @@ public void startRebalance(long delay){
 
     /** {@inheritDoc} */
     @Override public long estimateRebalancingFinishTime() {
+        return getEstimatedRebalancingFinishTime();
+    }
+
+    /** {@inheritDoc} */
+    @Override public long rebalancingStartTime() {
+        return rebalanceStartTime.get();
+    }
+
+    /** {@inheritDoc} */
+    @Override public long getEstimatedRebalancingFinishTime() {
         long rate = rebalancingKeysRate.getRate();
 
         return rate <= 0 ? -1L :
             ((getKeysToRebalanceLeft() / rate) * REBALANCE_RATE_INTERVAL) + U.currentTimeMillis();
     }
 
     /** {@inheritDoc} */
-    @Override public long rebalancingStartTime() {
+    @Override public long getRebalancingStartTime() {
         return rebalanceStartTime.get();
     }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java

@@ -733,6 +733,16 @@ public CacheMetricsSnapshot(CacheMetrics loc, Collection<CacheMetrics> metrics)
         return rebalanceStartTime;
     }
 
+    /** {@inheritDoc} */
+    @Override public long getEstimatedRebalancingFinishTime() {
+        return rebalanceFinishTime;
+    }
+
+    /** {@inheritDoc} */
+    @Override public long getRebalancingStartTime() {
+        return rebalanceStartTime;
+    }
+
     /** {@inheritDoc} */
     @Override public boolean isWriteBehindEnabled() {
         return isWriteBehindEnabled;

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupsMetricsRebalanceTest.java

@@ -189,13 +189,13 @@ public void testRebalanceEstimateFinishTime() throws Exception {
 
         waitForCondition(new PA() {
             @Override public boolean apply() {
-                return ig2.cache(CACHE1).localMetrics().rebalancingStartTime() != -1L;
+                return ig2.cache(CACHE1).localMetrics().getRebalancingStartTime() != -1L;
             }
         }, 5_000);
 
         CacheMetrics metrics = ig2.cache(CACHE1).localMetrics();
 
-        long startTime = metrics.rebalancingStartTime();
+        long startTime = metrics.getRebalancingStartTime();
 
         assertTrue(startTime > 0);
         assertTrue((U.currentTimeMillis() - startTime) < 5000);
@@ -235,7 +235,7 @@ public void testRebalanceEstimateFinishTime() throws Exception {
 
         latch.await();
 
-        long finishTime = ig2.cache(CACHE1).localMetrics().estimateRebalancingFinishTime();
+        long finishTime = ig2.cache(CACHE1).localMetrics().getEstimatedRebalancingFinishTime();
 
         assertTrue(finishTime > 0);
 

modules/core/src/test/java/org/apache/ignite/platform/PlatformCacheWriteMetricsTask.java

@@ -443,6 +443,16 @@ private static class TestCacheMetrics implements CacheMetrics {
         @Override public long rebalancingStartTime() {
             return 61;
         }
+
+        /** {@inheritDoc} */
+        @Override public long getEstimatedRebalancingFinishTime() {
+            return 62;
+        }
+
+        /** {@inheritDoc} */
+        @Override public long getRebalancingStartTime() {
+            return 63;
+        }
     }
 }