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/03/04 10:27:20 UTC
[1/2] ignite git commit: IGNITE-2761: Optimized "daemon" flag
resolution for TcpDiscoveryNode.
Repository: ignite
Updated Branches:
refs/heads/ignite-atomic-good-lock-bench 0d0c40ea5 -> 862a97dca
IGNITE-2761: Optimized "daemon" flag resolution for TcpDiscoveryNode.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee817dd7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee817dd7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee817dd7
Branch: refs/heads/ignite-atomic-good-lock-bench
Commit: ee817dd73694869e6f1262c9656d46f531dd547e
Parents: 1c4cfb6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Mar 4 12:25:31 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Mar 4 12:25:31 2016 +0300
----------------------------------------------------------------------
.../discovery/tcp/internal/TcpDiscoveryNode.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee817dd7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index 0be0bea..d1fbecf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -142,6 +142,14 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
@GridToStringExclude
private transient boolean cacheCli;
+ /** Daemon node initialization flag. */
+ @GridToStringExclude
+ private transient volatile boolean daemonInit;
+
+ /** Daemon node flag. */
+ @GridToStringExclude
+ private transient boolean daemon;
+
/**
* Public default no-arg constructor for {@link Externalizable} interface.
*/
@@ -374,7 +382,13 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
/** {@inheritDoc} */
@Override public boolean isDaemon() {
- return "true".equalsIgnoreCase((String)attribute(ATTR_DAEMON));
+ if (!daemonInit) {
+ daemon = "true".equalsIgnoreCase((String)attribute(ATTR_DAEMON));
+
+ daemonInit = true;
+ }
+
+ return daemon;
}
/** {@inheritDoc} */
[2/2] ignite git commit: Merge branch 'master' into
ignite-atomic-good-lock-bench
Posted by vo...@apache.org.
Merge branch 'master' into ignite-atomic-good-lock-bench
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/862a97dc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/862a97dc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/862a97dc
Branch: refs/heads/ignite-atomic-good-lock-bench
Commit: 862a97dcad7b479a7b8621001b90ac5fba38273b
Parents: 0d0c40e ee817dd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Mar 4 12:26:53 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Mar 4 12:26:53 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------