ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held.
Date Tue, 22 Dec 2015 09:47:19 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 0fd1e158e -> 7ebc2ffd9


ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock
is held.


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

Branch: refs/heads/ignite-1537
Commit: 7ebc2ffd97dc5343403fb0a1fccf57f8bb53cf33
Parents: 0fd1e15
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Dec 22 12:45:49 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Dec 22 12:45:49 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/datastreamer/DataStreamProcessor.java   | 2 +-
 .../org/apache/ignite/cache/websession/WebSessionFilter.java    | 5 ++---
 .../org/apache/ignite/cache/websession/WebSessionListener.java  | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7ebc2ffd/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
index 32f2ff5..da39209 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessor.java
@@ -90,7 +90,7 @@ public class DataStreamProcessor<K, V> extends GridProcessorAdapter
{
             return;
 
         marshErrBytes = marsh.marshal(new IgniteCheckedException("Failed to marshal response
error, " +
-            "see log for details."));
+            "see node log for details."));
 
         flusher = new IgniteThread(new GridWorker(ctx.gridName(), "grid-data-loader-flusher",
log) {
             @Override protected void body() throws InterruptedException {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ebc2ffd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index c3a3b32..4a84931 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -38,7 +38,6 @@ import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.internal.util.typedef.C1;
@@ -434,7 +433,7 @@ public class WebSessionFilter implements Filter {
 
                 break;
             }
-            catch (CacheException | BinaryObjectException e) {
+            catch (CacheException | IgniteException e) {
                 if (log.isDebugEnabled())
                     log.debug(e.getMessage());
 
@@ -442,7 +441,7 @@ public class WebSessionFilter implements Filter {
                     throw new IgniteException("Failed to save session: " + sesId, e);
                 else {
                     if (log.isDebugEnabled())
-                    log.debug("Failed to save session (will retry): " + sesId);
+                        log.debug("Failed to save session (will retry): " + sesId);
 
                     IgniteFuture<?> retryFut = null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7ebc2ffd/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
index a1c1106..63f58f5 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java
@@ -32,7 +32,6 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.cluster.ClusterTopologyException;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -121,7 +120,7 @@ class WebSessionListener {
 
                     break;
                 }
-                catch (CacheException | BinaryObjectException e) {
+                catch (CacheException | IgniteException e) {
                     if (i == retries - 1) {
                         U.warn(log, "Failed to apply updates for session (maximum number
of retries exceeded) [sesId=" +
                             sesId + ", retries=" + retries + ']');


Mime
View raw message