You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2017/08/21 14:14:46 UTC
ignite git commit: Deprecated IgniteConfiguration.discoStartupDelay
Repository: ignite
Updated Branches:
refs/heads/master f4e4f77d1 -> 8436ae006
Deprecated IgniteConfiguration.discoStartupDelay
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8436ae00
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8436ae00
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8436ae00
Branch: refs/heads/master
Commit: 8436ae006dd0e45d040a71a7c5a9234e5b8174d5
Parents: f4e4f77
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Aug 21 17:14:38 2017 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Aug 21 17:14:38 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 5 +++++
.../ignite/internal/managers/communication/GridIoManager.java | 7 -------
.../internal/processors/cache/persistence/MemoryPolicy.java | 3 ++-
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8436ae00/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index cafa675..1cc99da 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -374,6 +374,7 @@ public class IgniteConfiguration {
private boolean cacheSanityCheckEnabled = DFLT_CACHE_SANITY_CHECK_ENABLED;
/** Discovery startup delay. */
+ @Deprecated
private long discoStartupDelay = DFLT_DISCOVERY_STARTUP_DELAY;
/** Tasks classes sharing mode. */
@@ -1932,7 +1933,9 @@ public class IgniteConfiguration {
* delay, you should increase this value.
*
* @return Time in milliseconds for when nodes can be out-of-sync.
+ * @deprecated Not used any more.
*/
+ @Deprecated
public long getDiscoveryStartupDelay() {
return discoStartupDelay;
}
@@ -1944,7 +1947,9 @@ public class IgniteConfiguration {
* @param discoStartupDelay Time in milliseconds for when nodes
* can be out-of-sync during startup.
* @return {@code this} for chaining.
+ * @deprecated Not used any more.
*/
+ @Deprecated
public IgniteConfiguration setDiscoveryStartupDelay(long discoStartupDelay) {
this.discoStartupDelay = discoStartupDelay;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8436ae00/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 2005032..f63f5f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -164,9 +164,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
/** Local node ID. */
private final UUID locNodeId;
- /** Discovery delay. */
- private final long discoDelay;
-
/** Cache for messages that were received prior to discovery. */
private final ConcurrentMap<UUID, ConcurrentLinkedDeque8<DelayedMessage>> waitMap =
new ConcurrentHashMap8<>();
@@ -227,8 +224,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
locNodeId = ctx.localNodeId();
- discoDelay = ctx.config().getDiscoveryStartupDelay();
-
marsh = ctx.config().getMarshaller();
synchronized (sysLsnrsMux) {
@@ -264,8 +259,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
@Override public void start() throws IgniteCheckedException {
- assertParameter(discoDelay > 0, "discoveryStartupDelay > 0");
-
startSpi();
getSpi().setListener(commLsnr = new CommunicationListener<Serializable>() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8436ae00/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
index 7c7d7bc..4059c12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicy.java
@@ -46,7 +46,8 @@ public class MemoryPolicy {
PageMemory pageMem,
MemoryPolicyConfiguration cfg,
MemoryMetricsImpl memMetrics,
- PageEvictionTracker evictionTracker) {
+ PageEvictionTracker evictionTracker
+ ) {
this.pageMem = pageMem;
this.memMetrics = memMetrics;
this.cfg = cfg;