You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/09/15 08:43:10 UTC
[1/3] ignite git commit: IGNITE-1465: Fixed.
Repository: ignite
Updated Branches:
refs/heads/master 7955c15a9 -> a4d2f2fd2
IGNITE-1465: Fixed.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8b798d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8b798d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8b798d7
Branch: refs/heads/master
Commit: f8b798d75c53e051ed2171441a2325e8d108300d
Parents: 961a467
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 15 09:34:27 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 15 09:34:27 2015 +0300
----------------------------------------------------------------------
.../internal/processors/hadoop/SecondaryFileSystemProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f8b798d7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/SecondaryFileSystemProvider.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/SecondaryFileSystemProvider.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/SecondaryFileSystemProvider.java
index fdb61e8..d5be074 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/SecondaryFileSystemProvider.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/SecondaryFileSystemProvider.java
@@ -60,8 +60,8 @@ public class SecondaryFileSystemProvider {
if (url == null) {
// If secConfPath is given, it should be resolvable:
- throw new IllegalArgumentException("Failed to resolve secondary file system " +
- "configuration path: " + secConfPath);
+ throw new IllegalArgumentException("Failed to resolve secondary file system configuration path " +
+ "(ensure that it exists locally and you have read access to it): " + secConfPath);
}
cfg.addResource(url);
[2/3] ignite git commit: IGNITE-1378 - Fixed exception handling in
GridContinuousProcessor.startRoutine()
Posted by vk...@apache.org.
IGNITE-1378 - Fixed exception handling in GridContinuousProcessor.startRoutine()
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1914c021
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1914c021
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1914c021
Branch: refs/heads/master
Commit: 1914c0216608dc8eecf97fb3ee4bdfb6fdec740c
Parents: f8b798d
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Mon Sep 14 23:37:26 2015 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Mon Sep 14 23:37:26 2015 -0700
----------------------------------------------------------------------
.../continuous/GridContinuousProcessor.java | 22 +++++++-------------
1 file changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1914c021/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
index 3dcfff8..18c1f36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
@@ -566,30 +566,22 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
startFuts.put(routineId, fut);
try {
+ if (locIncluded && registerHandler(ctx.localNodeId(), routineId, hnd, bufSize, interval, autoUnsubscribe, true))
+ hnd.onListenerRegistered(routineId, ctx);
+
ctx.discovery().sendCustomEvent(new StartRoutineDiscoveryMessage(routineId, reqData));
}
- catch (IgniteCheckedException e) { // Marshaller exception may occurs if user pass unmarshallable filter.
+ catch (IgniteCheckedException e) {
startFuts.remove(routineId);
-
locInfos.remove(routineId);
+ unregisterHandler(routineId, hnd, true);
+
fut.onDone(e);
return fut;
}
- // Register local handler if needed.
- if (locIncluded) {
- try {
- if (registerHandler(ctx.localNodeId(), routineId, hnd, bufSize, interval, autoUnsubscribe, true))
- hnd.onListenerRegistered(routineId, ctx);
- }
- catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(
- new IgniteCheckedException("Failed to register handler locally: " + hnd, e));
- }
- }
-
// Handler is registered locally.
fut.onLocalRegistered();
@@ -1624,4 +1616,4 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
return S.toString(SyncMessageAckFuture.class, this);
}
}
-}
\ No newline at end of file
+}
[3/3] ignite git commit: Merge branch 'ignite-1.4'
Posted by vk...@apache.org.
Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4d2f2fd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4d2f2fd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4d2f2fd
Branch: refs/heads/master
Commit: a4d2f2fd2bdc1cab67c0646422a54db8f71b1927
Parents: 7955c15 1914c02
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Mon Sep 14 23:41:47 2015 -0700
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Mon Sep 14 23:41:47 2015 -0700
----------------------------------------------------------------------
.../continuous/GridContinuousProcessor.java | 22 +++++++-------------
.../hadoop/SecondaryFileSystemProvider.java | 4 ++--
2 files changed, 9 insertions(+), 17 deletions(-)
----------------------------------------------------------------------