You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2016/09/23 16:20:08 UTC
[1/5] ignite git commit: IGNITE-3925: Output process ID to the log on
node start.
Repository: ignite
Updated Branches:
refs/heads/master 9cd4ab8ff -> 16a29d311
IGNITE-3925: Output process ID to the log on node start.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/29f508b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29f508b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29f508b1
Branch: refs/heads/master
Commit: 29f508b17eb383a1c910c72e7d5056564acc37c2
Parents: 9666dc4
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Sep 23 10:59:55 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Sep 23 10:59:55 2016 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/29f508b1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index b85692e..827b54a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1781,6 +1781,11 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (log.isInfoEnabled()) {
log.info("OS: " + U.osString());
log.info("OS user: " + System.getProperty("user.name"));
+
+ int jvmPid = U.jvmPid();
+
+ if (log.isInfoEnabled())
+ log.info("PID: " + (jvmPid == -1 ? "N/A" : jvmPid));
}
}
[3/5] ignite git commit: Merge remote-tracking branch
'remotes/upstream/ignite-1.6.9' into ignite-1.7.2
Posted by pt...@apache.org.
Merge remote-tracking branch 'remotes/upstream/ignite-1.6.9' into ignite-1.7.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/920b56e7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/920b56e7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/920b56e7
Branch: refs/heads/master
Commit: 920b56e777a5ca0d0a5fb9bfa27622c3b4c17ea5
Parents: 52e9a2b 40f6472
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Sep 23 11:40:16 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 23 11:40:16 2016 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 +++++
.../internal/processors/cache/transactions/IgniteTxManager.java | 5 +----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/5] ignite git commit: IGNITE-3874 sync putIfAbsent forever blocked
on all nodes after one node is stopped
Posted by pt...@apache.org.
IGNITE-3874 sync putIfAbsent forever blocked on all nodes after one node is stopped
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40f64725
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40f64725
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40f64725
Branch: refs/heads/master
Commit: 40f647258a10fa8b42ac6fda67d6fa4db71b8100
Parents: 29f508b
Author: Anton Vinogradov <av...@apache.org>
Authored: Thu Sep 8 18:58:31 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Sep 23 11:31:17 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/transactions/IgniteTxManager.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f64725/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index a1580a5..c72d7f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -374,7 +374,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
"crashed or left grid: " + CU.txString(tx));
}
}
- catch (IgniteTxOptimisticCheckedException ignore) {
+ catch (IgniteCheckedException ignore) {
if (log.isDebugEnabled())
log.debug("Optimistic failure while invalidating transaction (will rollback): " +
tx.xidVersion());
@@ -386,9 +386,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
U.error(log, "Failed to rollback transaction: " + tx.xidVersion(), e);
}
}
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to invalidate transaction: " + tx, e);
- }
}
else if (state == MARKED_ROLLBACK) {
try {
[5/5] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-1.7.2' into UPSTREAM_master
Posted by pt...@apache.org.
Merge remote-tracking branch 'remotes/community/ignite-1.7.2' into UPSTREAM_master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/16a29d31
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/16a29d31
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/16a29d31
Branch: refs/heads/master
Commit: 16a29d311b23d8e136fd05b2e5ae4f6da3e9ecab
Parents: 9cd4ab8 dfc7288
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Fri Sep 23 19:19:31 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Fri Sep 23 19:19:31 2016 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 +++++
.../internal/processors/cache/transactions/IgniteTxManager.java | 5 +----
.../platform/websession/PlatformDotNetSessionLockProcessor.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[4/5] ignite git commit: IGNITE-3199 .NET: ASP.NET Session-State
Store Provider - fix javadoc
Posted by pt...@apache.org.
IGNITE-3199 .NET: ASP.NET Session-State Store Provider - fix javadoc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfc72881
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfc72881
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfc72881
Branch: refs/heads/master
Commit: dfc728817c3cd3512760bc7383b747e8b4f8b13d
Parents: 920b56e
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Fri Sep 23 19:18:26 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Fri Sep 23 19:18:26 2016 +0300
----------------------------------------------------------------------
.../platform/websession/PlatformDotNetSessionLockProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfc72881/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/PlatformDotNetSessionLockProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/PlatformDotNetSessionLockProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/PlatformDotNetSessionLockProcessor.java
index 0e51448..b1c45a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/PlatformDotNetSessionLockProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/PlatformDotNetSessionLockProcessor.java
@@ -77,7 +77,7 @@ public class PlatformDotNetSessionLockProcessor implements CacheEntryProcessor<S
return new PlatformDotNetSessionLockResult(true, data, null, data.lockId());
}
- /** {@inheritDoc */
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(PlatformDotNetSessionLockProcessor.class, this);
}