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/08/05 07:32:16 UTC
[1/3] ignite git commit: IGNITE-3331 IGFS: Route client tasks to
primary node when metadata co-location is enabled. This closes #921.
Repository: ignite
Updated Branches:
refs/heads/master ee8ac73f2 -> 82504a0e5
IGNITE-3331 IGFS: Route client tasks to primary node when metadata co-location is enabled. This closes #921.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a596e67a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a596e67a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a596e67a
Branch: refs/heads/master
Commit: a596e67a1cf329ef07ebeef250166829a05ce901
Parents: 8c4a1c7
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Thu Aug 4 17:04:41 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Aug 4 17:04:41 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsMetaManager.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a596e67a/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 0d14a3a..d1151c5 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
@@ -248,7 +248,25 @@ public class IgfsMetaManager extends IgfsManager {
*/
<T> T runClientTask(IgfsClientAbstractCallable<T> task) {
try {
- return clientCompute().call(task);
+ return runClientTask(IgfsUtils.ROOT_ID, task);
+ }
+ catch (ClusterTopologyException e) {
+ throw new IgfsException("Failed to execute operation because there are no IGFS metadata nodes." , e);
+ }
+ }
+
+ /**
+ * Run client task.
+ *
+ * @param affinityFileId Affinity fileId.
+ * @param task Task.
+ * @return Result.
+ */
+ <T> T runClientTask(IgniteUuid affinityFileId, IgfsClientAbstractCallable<T> task) {
+ try {
+ return (cfg.isColocateMetadata()) ?
+ clientCompute().affinityCall(cfg.getMetaCacheName(), affinityFileId, task) :
+ clientCompute().call(task);
}
catch (ClusterTopologyException e) {
throw new IgfsException("Failed to execute operation because there are no IGFS metadata nodes." , e);
[2/3] ignite git commit: Merge branch 'ignite-1.7.1'
Posted by vo...@apache.org.
Merge branch 'ignite-1.7.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a7965c7d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a7965c7d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a7965c7d
Branch: refs/heads/master
Commit: a7965c7d4cf564f78df7d47aa14e150913d637e8
Parents: 59fb5ef a596e67
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Aug 5 10:31:08 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Aug 5 10:31:08 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsMetaManager.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82504a0e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82504a0e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82504a0e
Branch: refs/heads/master
Commit: 82504a0e5434051af08628afdf1d95283fdb4f49
Parents: a7965c7 ee8ac73
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Aug 5 10:31:56 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Aug 5 10:31:56 2016 +0300
----------------------------------------------------------------------
modules/cassandra/pom.xml | 24 +-
.../cassandra/src/test/bootstrap/aws/README.txt | 13 +
.../aws/cassandra/cassandra-bootstrap.sh | 449 +++---
.../bootstrap/aws/cassandra/cassandra-env.sh | 4 +
.../bootstrap/aws/cassandra/cassandra-start.sh | 483 +-----
.../aws/cassandra/cassandra-template.yaml | 9 +-
.../cassandra/src/test/bootstrap/aws/common.sh | 1481 ++++++++++++++++++
modules/cassandra/src/test/bootstrap/aws/env.sh | 113 ++
.../test/bootstrap/aws/ganglia/agent-start.sh | 75 +
.../bootstrap/aws/ganglia/ganglia-bootstrap.sh | 417 +++++
.../bootstrap/aws/ignite/ignite-bootstrap.sh | 456 +++---
.../ignite/ignite-cassandra-server-template.xml | 27 +-
.../src/test/bootstrap/aws/ignite/ignite-env.sh | 6 +-
.../test/bootstrap/aws/ignite/ignite-start.sh | 537 +------
.../src/test/bootstrap/aws/logs-collector.sh | 179 ++-
.../tests/ignite-cassandra-client-template.xml | 21 +-
.../test/bootstrap/aws/tests/tests-bootstrap.sh | 448 +++---
.../test/bootstrap/aws/tests/tests-manager.sh | 458 ++++++
.../test/bootstrap/aws/tests/tests-report.sh | 189 +--
.../src/test/bootstrap/aws/tests/tests-run.sh | 715 ---------
.../LoadTestsCassandraArtifactsCreator.java | 104 ++
.../tests/cassandra/connection-settings.xml | 6 +-
.../tests/persistence/blob/ignite-config.xml | 6 -
.../tests/persistence/pojo/ignite-config.xml | 6 -
.../persistence/primitive/ignite-config.xml | 6 -
.../primitive/ignite-remote-client-config.xml | 6 +-
.../primitive/ignite-remote-server-config.xml | 6 +-
.../scripts/recreate-cassandra-artifacts.bat | 39 +
.../scripts/recreate-cassandra-artifacts.sh | 39 +
29 files changed, 3756 insertions(+), 2566 deletions(-)
----------------------------------------------------------------------