ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-4988 Fixed merge result.
Date Sun, 23 Apr 2017 02:54:59 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 3a5c6f359 -> 045ae6652


IGNITE-4988 Fixed merge result.


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

Branch: refs/heads/ignite-2.0
Commit: 045ae66524be8c41007a9ddf641e1ffb01046487
Parents: 3a5c6f3
Author: Alexey Kuznetsov <akuznetsov@gridgain.com>
Authored: Sun Apr 23 09:54:43 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@gridgain.com>
Committed: Sun Apr 23 09:54:43 2017 +0700

----------------------------------------------------------------------
 .../ignite/internal/visor/cache/VisorCachePartitionsTask.java    | 2 +-
 .../ignite/internal/visor/node/VisorNodeDataCollectorTask.java   | 4 +---
 .../internal/visor/node/VisorNodeDataCollectorTaskResult.java    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/045ae665/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitionsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitionsTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitionsTask.java
index c9339b7..69188c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitionsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitionsTask.java
@@ -124,7 +124,7 @@ public class VisorCachePartitionsTask extends VisorMultiNodeTask<VisorCacheParti
                     for (GridDhtLocalPartition part : locParts) {
                         int p = part.id();
 
-                        long sz = part.publicSize();
+                        long sz = part.dataStore().size();
 
                         // Pass NONE as topology version in order not to wait for topology
version.
                         if (part.primary(AffinityTopologyVersion.NONE))

http://git-wip-us.apache.org/repos/asf/ignite/blob/045ae665/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 af02e34..a317ffe 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
@@ -71,9 +71,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
             }
         }
 
-        taskRes.active(true /*ignite.active()*/);
-
-        taskRes.active(ignite.active());
+        taskRes.setActive(ignite.active());
 
         return taskRes;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/045ae665/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 5018f43..669cc80 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
@@ -109,14 +109,14 @@ public class VisorNodeDataCollectorTaskResult extends VisorDataTransferObject
{
     /**
      * @return {@code True} if grid is active.
      */
-    public boolean active() {
+    public boolean isActive() {
         return active;
     }
 
     /**
      * @param active active New value of grid active flag.
      */
-    public void active(boolean active) {
+    public void setActive(boolean active) {
         this.active = active;
     }
 


Mime
View raw message