ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/22] incubator-ignite git commit: # IGNITE-515: Code cleanup from streamer.
Date Fri, 20 Mar 2015 12:07:45 GMT
# IGNITE-515: Code cleanup from streamer.


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

Branch: refs/heads/ignite-gg-9924
Commit: f08fe8b60a638c2991396c566f5f642643ebc31d
Parents: 1cc3d52
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Mar 20 08:08:34 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Mar 20 08:08:34 2015 +0700

----------------------------------------------------------------------
 .../visor/node/VisorNodeDataCollectorJob.java   |  2 +-
 .../node/VisorNodeDataCollectorJobResult.java   | 17 -----------
 .../visor/node/VisorNodeDataCollectorTask.java  |  3 --
 .../node/VisorNodeDataCollectorTaskResult.java  | 31 +++++++-------------
 4 files changed, 11 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/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 a01bb1f..f40b1ec 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
@@ -207,7 +207,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
         igfs(res);
 
         if (debug)
-            start0 = log(ignite.log(), "Collected igfs", getClass(), start0);
+            log(ignite.log(), "Collected igfs", getClass(), start0);
 
         res.errorCount(ignite.context().exceptionRegistry().errorCount());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/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 b1bc44e..134447c 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
@@ -61,9 +61,6 @@ public class VisorNodeDataCollectorJobResult implements Serializable {
     /** Exception while collecting node IGFSs. */
     private Throwable igfssEx;
 
-    /** Exception while collecting node streamers. */
-    private Throwable streamersEx;
-
     /** Errors count. */
     private long errCnt;
 
@@ -180,20 +177,6 @@ public class VisorNodeDataCollectorJobResult implements Serializable
{
     }
 
     /**
-     * @return Exception caught during collecting streamers metrics.
-     */
-    public Throwable streamersEx() {
-        return streamersEx;
-    }
-
-    /**
-     * @param streamersEx Exception caught during collecting streamers metrics.
-     */
-    public void streamersEx(Throwable streamersEx) {
-        this.streamersEx = streamersEx;
-    }
-
-    /**
      * @return Errors count.
      */
     public long errorCount() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/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 723b1a3..b6c9bbd 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
@@ -123,9 +123,6 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
         if (jobRes.cachesEx() != null)
             taskRes.cachesEx().put(nid, jobRes.cachesEx());
 
-        if (jobRes.streamersEx() != null)
-            taskRes.streamersEx().put(nid, jobRes.streamersEx());
-
         if (!jobRes.igfss().isEmpty())
             taskRes.igfss().put(nid, jobRes.igfss());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f08fe8b6/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 bacfbc4..6485978 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
@@ -67,26 +67,22 @@ public class VisorNodeDataCollectorTaskResult implements Serializable
{
     /** Exceptions caught during collecting IGFS from nodes. */
     private final Map<UUID, Throwable> igfssEx = new HashMap<>();
 
-    /** Exceptions caught during collecting streamers from nodes. */
-    private final Map<UUID, Throwable> streamersEx = new HashMap<>();
-
     /**
      * @return {@code true} If no data was collected.
      */
     public boolean isEmpty() {
         return
             gridNames.isEmpty() &&
-                topVersions.isEmpty() &&
-                unhandledEx.isEmpty() &&
-                taskMonitoringEnabled.isEmpty() &&
-                evts.isEmpty() &&
-                evtsEx.isEmpty() &&
-                caches.isEmpty() &&
-                cachesEx.isEmpty() &&
-                igfss.isEmpty() &&
-                igfsEndpoints.isEmpty() &&
-                igfssEx.isEmpty() &&
-                streamersEx.isEmpty();
+            topVersions.isEmpty() &&
+            unhandledEx.isEmpty() &&
+            taskMonitoringEnabled.isEmpty() &&
+            evts.isEmpty() &&
+            evtsEx.isEmpty() &&
+            caches.isEmpty() &&
+            cachesEx.isEmpty() &&
+            igfss.isEmpty() &&
+            igfsEndpoints.isEmpty() &&
+            igfssEx.isEmpty();
     }
 
     /**
@@ -167,13 +163,6 @@ public class VisorNodeDataCollectorTaskResult implements Serializable
{
     }
 
     /**
-     * @return Exceptions caught during collecting streamers from nodes.
-     */
-    public Map<UUID, Throwable> streamersEx() {
-        return streamersEx;
-    }
-
-    /**
      * @return Nodes error counts.
      */
     public Map<UUID, Long> errorCounts() {


Mime
View raw message