You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/06/20 12:53:28 UTC
[48/50] ignite git commit: Revert "IGNITE-3331: IGFS: Better affinity
management for client tasks."
Revert "IGNITE-3331: IGFS: Better affinity management for client tasks."
This reverts commit 06831b13f4a9693e767f2e299abcc57605c87da5.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c952def5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c952def5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c952def5
Branch: refs/heads/ignite-3341
Commit: c952def5de5f2df1e825869d99d362af71ba87ab
Parents: 04af846
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 17 17:39:46 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 17 17:39:46 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsMetaManager.java | 45 ++++----------------
.../igfs/client/IgfsClientAbstractCallable.java | 5 ---
.../igfs/client/IgfsClientAffinityCallable.java | 5 ---
.../igfs/client/IgfsClientDeleteCallable.java | 5 ---
.../igfs/client/IgfsClientExistsCallable.java | 5 ---
.../igfs/client/IgfsClientInfoCallable.java | 5 ---
.../client/IgfsClientListFilesCallable.java | 5 ---
.../client/IgfsClientListPathsCallable.java | 5 ---
.../igfs/client/IgfsClientMkdirsCallable.java | 5 ---
.../igfs/client/IgfsClientRenameCallable.java | 5 ---
.../igfs/client/IgfsClientSetTimesCallable.java | 5 ---
.../igfs/client/IgfsClientSizeCallable.java | 5 ---
.../igfs/client/IgfsClientSummaryCallable.java | 5 ---
.../igfs/client/IgfsClientUpdateCallable.java | 5 ---
.../meta/IgfsClientMetaIdsForPathCallable.java | 5 ---
.../meta/IgfsClientMetaInfoForPathCallable.java | 5 ---
16 files changed, 9 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 30c7d10..943c4c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -150,11 +150,8 @@ public class IgfsMetaManager extends IgfsManager {
/** Client flag. */
private final boolean client;
- /** Compute facade. */
- private IgniteCompute compute;
-
/** Compute facade for client tasks. */
- private IgniteCompute metaCompute;
+ private IgniteCompute cliCompute;
/**
* Constructor.
@@ -251,12 +248,7 @@ public class IgfsMetaManager extends IgfsManager {
*/
<T> T runClientTask(IgfsClientAbstractCallable<T> task) {
try {
- if (!task.isReadOnly() && cfg.isColocateMetadata())
- // If task mutates state and co-location is enabled, we route request to primary node.
- return compute().affinityCall(cfg.getMetaCacheName(), IgfsUtils.ROOT_ID, task);
- else
- // Otherwise we route to any available data node.
- return metaCompute().call(task);
+ return clientCompute().call(task);
}
catch (ClusterTopologyException e) {
throw new IgfsException("Failed to execute operation because there are no IGFS metadata nodes." , e);
@@ -268,43 +260,24 @@ public class IgfsMetaManager extends IgfsManager {
*
* @return Compute facade.
*/
- private IgniteCompute compute() {
- IgniteCompute compute0 = compute;
-
- if (compute0 == null) {
- compute0 = igfsCtx.kernalContext().grid().compute();
-
- compute = compute0;
- }
-
- assert compute0 != null;
-
- return compute0;
- }
-
- /**
- * Get metadata compute facade for client tasks.
- *
- * @return Metadata compute facade.
- */
- private IgniteCompute metaCompute() {
+ private IgniteCompute clientCompute() {
assert client;
- IgniteCompute metaCompute0 = metaCompute;
+ IgniteCompute cliCompute0 = cliCompute;
- if (metaCompute0 == null) {
+ if (cliCompute0 == null) {
IgniteEx ignite = igfsCtx.kernalContext().grid();
ClusterGroup cluster = ignite.cluster().forIgfsMetadataDataNodes(cfg.getName(), cfg.getMetaCacheName());
- metaCompute0 = ignite.compute(cluster);
+ cliCompute0 = ignite.compute(cluster);
- metaCompute = metaCompute0;
+ cliCompute = cliCompute0;
}
- assert metaCompute0 != null;
+ assert cliCompute0 != null;
- return metaCompute0;
+ return cliCompute0;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
index c06619f..d9c3456 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAbstractCallable.java
@@ -85,11 +85,6 @@ public abstract class IgfsClientAbstractCallable<T> implements IgniteCallable<T>
*/
protected abstract T call0(IgfsContext ctx) throws Exception;
- /**
- * @return {@code True} if task is read-only and does not change metadata.
- */
- public abstract boolean isReadOnly();
-
/** {@inheritDoc} */
@Override public final void writeBinary(BinaryWriter writer) throws BinaryObjectException {
BinaryRawWriter rawWriter = writer.rawWriter();
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
index 6e2748d..1668f36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientAffinityCallable.java
@@ -74,11 +74,6 @@ public class IgfsClientAffinityCallable extends IgfsClientAbstractCallable<Colle
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException {
writer.writeLong(start);
writer.writeLong(len);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
index 21f8c46..c1b8be8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientDeleteCallable.java
@@ -61,11 +61,6 @@ public class IgfsClientDeleteCallable extends IgfsClientAbstractCallable<Boolean
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return false;
- }
-
- /** {@inheritDoc} */
@Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException {
writer.writeBoolean(recursive);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
index 536cdc8..04b63d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientExistsCallable.java
@@ -52,11 +52,6 @@ public class IgfsClientExistsCallable extends IgfsClientAbstractCallable<Boolean
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientExistsCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
index 6bab8b8..f97c3c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientInfoCallable.java
@@ -53,11 +53,6 @@ public class IgfsClientInfoCallable extends IgfsClientAbstractCallable<IgfsFile>
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientInfoCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
index deb8836..325e714 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListFilesCallable.java
@@ -55,11 +55,6 @@ public class IgfsClientListFilesCallable extends IgfsClientAbstractCallable<Coll
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientListFilesCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
index ad6c858..78b4c84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientListPathsCallable.java
@@ -54,11 +54,6 @@ public class IgfsClientListPathsCallable extends IgfsClientAbstractCallable<Coll
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientListPathsCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
index 6ecb6ea..944da6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientMkdirsCallable.java
@@ -66,11 +66,6 @@ public class IgfsClientMkdirsCallable extends IgfsClientAbstractCallable<Void> {
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return false;
- }
-
- /** {@inheritDoc} */
@Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException {
IgfsUtils.writeProperties(writer, props);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
index 142af47..55afb83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientRenameCallable.java
@@ -64,11 +64,6 @@ public class IgfsClientRenameCallable extends IgfsClientAbstractCallable<Void> {
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return false;
- }
-
- /** {@inheritDoc} */
@Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException {
IgfsUtils.writePath(writer, destPath);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
index 8c302bc..277effc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
@@ -69,11 +69,6 @@ public class IgfsClientSetTimesCallable extends IgfsClientAbstractCallable<Void>
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return false;
- }
-
- /** {@inheritDoc} */
@Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException {
writer.writeLong(accessTime);
writer.writeLong(modificationTime);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
index 29a7b7a..474a940 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSizeCallable.java
@@ -53,11 +53,6 @@ public class IgfsClientSizeCallable extends IgfsClientAbstractCallable<Long> {
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientSizeCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
index 1e2795c..7e29029 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSummaryCallable.java
@@ -53,11 +53,6 @@ public class IgfsClientSummaryCallable extends IgfsClientAbstractCallable<IgfsPa
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientSummaryCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
index 82d6e8d..4acf4eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientUpdateCallable.java
@@ -65,11 +65,6 @@ public class IgfsClientUpdateCallable extends IgfsClientAbstractCallable<IgfsFil
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return false;
- }
-
- /** {@inheritDoc} */
@Override public void writeBinary0(BinaryRawWriter writer) throws BinaryObjectException {
IgfsUtils.writeProperties(writer, props);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
index b07a0cb..7b3d142 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaIdsForPathCallable.java
@@ -59,11 +59,6 @@ public class IgfsClientMetaIdsForPathCallable extends IgfsClientAbstractCallable
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientMetaIdsForPathCallable.class, this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c952def5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
index e7e0164..cb31663 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/meta/IgfsClientMetaInfoForPathCallable.java
@@ -57,11 +57,6 @@ public class IgfsClientMetaInfoForPathCallable extends IgfsClientAbstractCallabl
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsClientMetaInfoForPathCallable.class, this);
}