You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/22 11:11:19 UTC

[10/13] ignite git commit: IGNITE-7106 Improved collecting of rebalance metrics.

IGNITE-7106 Improved collecting of rebalance metrics.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa55a6e9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa55a6e9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa55a6e9

Branch: refs/heads/ignite-zk
Commit: fa55a6e9a32c4886148b9aa0ba9e4a2780fe1177
Parents: 400cbf3
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Dec 21 17:29:28 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Dec 21 17:29:28 2017 +0700

----------------------------------------------------------------------
 .../visor/node/VisorNodeDataCollectorJob.java   | 11 +++++++++
 .../node/VisorNodeDataCollectorJobResult.java   | 24 ++++++++++++++++++++
 .../visor/node/VisorNodeDataCollectorTask.java  | 13 +++++++----
 .../node/VisorNodeDataCollectorTaskResult.java  | 20 ++++++++++++++++
 4 files changed, 63 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa55a6e9/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 7e921ad..fda23a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.ignite.IgniteFileSystem;
 import org.apache.ignite.DataRegionMetrics;
+import org.apache.ignite.cache.CacheMetrics;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.FileSystemConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
@@ -182,6 +183,9 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
 
             List<VisorCache> resCaches = res.getCaches();
 
+            double total = 0;
+            double moving = 0;
+
             for (String cacheName : cacheProc.cacheNames()) {
                 if (proxyCache(cacheName))
                     continue;
@@ -195,6 +199,11 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
                         if (ca == null || !ca.context().started())
                             continue;
 
+                        CacheMetrics cm = ca.localMetrics();
+
+                        total += cm.getTotalPartitionsCount();
+                        moving += cm.getRebalancingPartitionsCount();
+
                         resCaches.add(new VisorCache(ignite, ca, arg.isCollectCacheMetrics()));
                     }
                     catch(IllegalStateException | IllegalArgumentException e) {
@@ -207,6 +216,8 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
                     }
                 }
             }
+
+            res.setRebalance(total > 0 ? (total - moving) / total : -1);
         }
         catch (Exception e) {
             res.setCachesEx(new VisorExceptionWrapper(e));

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa55a6e9/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
index 0612c5e..e350157 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJobResult.java
@@ -90,6 +90,9 @@ public class VisorNodeDataCollectorJobResult extends VisorDataTransferObject {
     /** Exception while collecting persistence metrics. */
     private VisorExceptionWrapper persistenceMetricsEx;
 
+    /** Rebalance percent. */
+    private double rebalance;
+
     /**
      * Default constructor.
      */
@@ -302,6 +305,25 @@ public class VisorNodeDataCollectorJobResult extends VisorDataTransferObject {
         this.persistenceMetricsEx = persistenceMetricsEx;
     }
 
+    /**
+     * @return Rebalance progress.
+     */
+    public double getRebalance() {
+        return rebalance;
+    }
+
+    /**
+     * @param  rebalance Rebalance progress.
+     */
+    public void setRebalance(double rebalance) {
+        this.rebalance = rebalance;
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte getProtocolVersion() {
+        return V2;
+    }
+
     /** {@inheritDoc} */
     @Override protected void writeExternalData(ObjectOutput out) throws IOException {
         U.writeString(out, gridName);
@@ -321,6 +343,7 @@ public class VisorNodeDataCollectorJobResult extends VisorDataTransferObject {
         out.writeBoolean(hasPendingExchange);
         out.writeObject(persistenceMetrics);
         out.writeObject(persistenceMetricsEx);
+        out.writeDouble(rebalance);
     }
 
     /** {@inheritDoc} */
@@ -342,6 +365,7 @@ public class VisorNodeDataCollectorJobResult extends VisorDataTransferObject {
         hasPendingExchange = in.readBoolean();
         persistenceMetrics = (VisorPersistenceMetrics)in.readObject();
         persistenceMetricsEx = (VisorExceptionWrapper)in.readObject();
+        rebalance = (protoVer > V1) ? in.readDouble() : -1;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa55a6e9/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
index abd9ce2..fffc3bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteException;
 import org.apache.ignite.cluster.ClusterGroupEmptyException;
 import org.apache.ignite.compute.ComputeJobResult;
 import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.visor.VisorMultiNodeTask;
 import org.apache.ignite.internal.visor.util.VisorExceptionWrapper;
 import org.jetbrains.annotations.Nullable;
@@ -93,28 +94,28 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
 
         taskRes.getErrorCounts().put(nid, jobRes.getErrorCount());
 
-        if (!jobRes.getEvents().isEmpty())
+        if (!F.isEmpty(jobRes.getEvents()))
             taskRes.getEvents().addAll(jobRes.getEvents());
 
         if (jobRes.getEventsEx() != null)
             taskRes.getEventsEx().put(nid, jobRes.getEventsEx());
 
-        if (!jobRes.getMemoryMetrics().isEmpty())
+        if (!F.isEmpty(jobRes.getMemoryMetrics()))
             taskRes.getMemoryMetrics().put(nid, jobRes.getMemoryMetrics());
 
         if (jobRes.getMemoryMetricsEx() != null)
             taskRes.getMemoryMetricsEx().put(nid, jobRes.getMemoryMetricsEx());
 
-        if (!jobRes.getCaches().isEmpty())
+        if (!F.isEmpty(jobRes.getCaches()))
             taskRes.getCaches().put(nid, jobRes.getCaches());
 
         if (jobRes.getCachesEx() != null)
             taskRes.getCachesEx().put(nid, jobRes.getCachesEx());
 
-        if (!jobRes.getIgfss().isEmpty())
+        if (!F.isEmpty(jobRes.getIgfss()))
             taskRes.getIgfss().put(nid, jobRes.getIgfss());
 
-        if (!jobRes.getIgfsEndpoints().isEmpty())
+        if (!F.isEmpty(jobRes.getIgfsEndpoints()))
             taskRes.getIgfsEndpoints().put(nid, jobRes.getIgfsEndpoints());
 
         if (jobRes.getIgfssEx() != null)
@@ -129,5 +130,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
         taskRes.getReadyAffinityVersions().put(nid, jobRes.getReadyAffinityVersion());
 
         taskRes.getPendingExchanges().put(nid, jobRes.isHasPendingExchange());
+
+        taskRes.getRebalance().put(nid, jobRes.getRebalance());
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa55a6e9/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
index ace964c..eb161f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTaskResult.java
@@ -100,6 +100,9 @@ public class VisorNodeDataCollectorTaskResult extends VisorDataTransferObject {
     /** Exceptions caught during collecting persistence metrics from nodes. */
     private Map<UUID, VisorExceptionWrapper> persistenceMetricsEx = new HashMap<>();
 
+    /** Rebalance state on nodes. */
+    private Map<UUID, Double> rebalance = new HashMap<>();
+
     /**
      * Default constructor.
      */
@@ -272,6 +275,18 @@ public class VisorNodeDataCollectorTaskResult extends VisorDataTransferObject {
     }
 
     /**
+     * @return Rebalance on nodes.
+     */
+    public Map<UUID, Double> getRebalance() {
+        return rebalance;
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte getProtocolVersion() {
+        return V2;
+    }
+
+    /**
      * Add specified results.
      *
      * @param res Results to add.
@@ -298,6 +313,7 @@ public class VisorNodeDataCollectorTaskResult extends VisorDataTransferObject {
         pendingExchanges.putAll(res.getPendingExchanges());
         persistenceMetrics.putAll(res.getPersistenceMetrics());
         persistenceMetricsEx.putAll(res.getPersistenceMetricsEx());
+        rebalance.putAll(res.getRebalance());
     }
 
     /** {@inheritDoc} */
@@ -321,6 +337,7 @@ public class VisorNodeDataCollectorTaskResult extends VisorDataTransferObject {
         U.writeMap(out, pendingExchanges);
         U.writeMap(out, persistenceMetrics);
         U.writeMap(out, persistenceMetricsEx);
+        U.writeMap(out, rebalance);
     }
 
     /** {@inheritDoc} */
@@ -344,6 +361,9 @@ public class VisorNodeDataCollectorTaskResult extends VisorDataTransferObject {
         pendingExchanges = U.readMap(in);
         persistenceMetrics = U.readMap(in);
         persistenceMetricsEx = U.readMap(in);
+
+        if (protoVer > V1)
+            rebalance = U.readMap(in);
     }
 
     /** {@inheritDoc} */