http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java index 64f7cc0..32a3d73 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java @@ -17,30 +17,24 @@ package com.gemstone.gemfire.distributed.internal; -import java.io.File; -import java.io.IOException; -import java.io.Serializable; -import java.net.InetAddress; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.GemFireIOException; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.ConfigSource; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.process.ProcessLauncherContext; import com.gemstone.gemfire.memcached.GemFireMemcachedServer; +import java.io.File; +import java.io.IOException; +import java.io.Serializable; +import java.net.InetAddress; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.*; + /** * Provides an implementation of <code>DistributionConfig</code> that * knows how to read the configuration file. @@ -1146,8 +1140,8 @@ public class DistributionConfigImpl private void computeMcastPortDefault() { // a no-op since multicast discovery has been removed // and the default mcast port is now zero - -// ConfigSource cs = getAttSourceMap().get(MCAST_PORT_NAME); + + // ConfigSource cs = getAttSourceMap().get(SystemConfigurationProperties.MCAST_PORT); // if (cs == null) { // String locators = getLocators(); // if (locators != null && !locators.isEmpty()) { @@ -1578,16 +1572,16 @@ public class DistributionConfigImpl if (value == null) { value = DEFAULT_NAME; } - this.name = (String)checkAttribute(NAME_NAME, value); + this.name = (String) checkAttribute(SystemConfigurationProperties.NAME, value); } public void setTcpPort(int value) { - this.tcpPort = (Integer)checkAttribute(TCP_PORT_NAME, value); + this.tcpPort = (Integer) checkAttribute(TCP_PORT, value); } public void setMcastPort(int value) { - this.mcastPort = (Integer)checkAttribute(MCAST_PORT_NAME, value); + this.mcastPort = (Integer) checkAttribute(MCAST_PORT, value); } public void setMcastTtl(int value) { - this.mcastTtl = (Integer)checkAttribute(MCAST_TTL_NAME, value); + this.mcastTtl = (Integer) checkAttribute(MCAST_TTL, value); } public void setSocketLeaseTime(int value) { this.socketLeaseTime = (Integer)checkAttribute(SOCKET_LEASE_TIME_NAME, value); @@ -1611,19 +1605,19 @@ public class DistributionConfigImpl } public void setMcastAddress(InetAddress value) { - this.mcastAddress = (InetAddress)checkAttribute(MCAST_ADDRESS_NAME, value); + this.mcastAddress = (InetAddress) checkAttribute(MCAST_ADDRESS, value); } public void setBindAddress(String value) { - this.bindAddress = (String)checkAttribute(BIND_ADDRESS_NAME, value); + this.bindAddress = (String) checkAttribute(BIND_ADDRESS, value); } public void setServerBindAddress(String value) { - this.serverBindAddress = (String)checkAttribute(SERVER_BIND_ADDRESS_NAME, value); + this.serverBindAddress = (String) checkAttribute(SERVER_BIND_ADDRESS, value); } public void setLocators(String value) { if (value == null) { value = DEFAULT_LOCATORS; } - this.locators = (String)checkAttribute(LOCATORS_NAME, value); + this.locators = (String) checkAttribute(LOCATORS, value); } public void setLocatorWaitTime(int value) { @@ -1680,7 +1674,7 @@ public class DistributionConfigImpl } } else { - value = (String)checkAttribute(START_LOCATOR_NAME, value); + value = (String) checkAttribute(START_LOCATOR, value); } } this.startLocator = value; @@ -3074,7 +3068,7 @@ public class DistributionConfigImpl */ public static void main(String args[]) throws IOException { DistributionConfigImpl cfg = new DistributionConfigImpl(); - String fileName = "gemfire.properties"; + String fileName = DistributionConfig.GEMFIRE_PREFIX + "properties"; if (args != null && args.length > 0) { String temp = args[0].trim(); fileName = "".equals(temp) ? fileName : temp; @@ -3089,12 +3083,12 @@ public class DistributionConfigImpl * to obtain a free port for your test. */ public void checkForDisallowedDefaults() { - if (Boolean.getBoolean("gemfire.disallowMcastDefaults")) { + if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disallowMcastDefaults")) { if (getMcastPort() != 0) { // it is not disabled if (getMcastAddress().equals(DistributionConfig.DEFAULT_MCAST_ADDRESS) && getMcastPort() == DistributionConfig.DEFAULT_MCAST_PORT) { throw new IllegalStateException( - "gemfire.disallowMcastDefaults set and default address and port are being used"); + DistributionConfig.GEMFIRE_PREFIX + "disallowMcastDefaults set and default address and port are being used"); } } }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java index 3f002cd..29a9da7 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java @@ -16,67 +16,16 @@ */ package com.gemstone.gemfire.distributed.internal; -import java.io.Externalizable; -import java.io.IOException; -import java.io.NotSerializableException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.io.Serializable; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.Semaphore; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.IncompatibleSystemException; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.ToDataException; +import com.gemstone.gemfire.*; import com.gemstone.gemfire.admin.GemFireHealthConfig; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.Role; import com.gemstone.gemfire.distributed.internal.locks.ElderState; -import com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MemberFactory; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.membership.NetView; +import com.gemstone.gemfire.distributed.internal.membership.*; import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.NanoTimer; -import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.SetUtils; -import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.Version; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.admin.remote.AdminConsoleDisconnectMessage; import com.gemstone.gemfire.internal.admin.remote.RemoteGfManagerAgent; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; @@ -92,6 +41,13 @@ import com.gemstone.gemfire.internal.tcp.Connection; import com.gemstone.gemfire.internal.tcp.ConnectionTable; import com.gemstone.gemfire.internal.tcp.ReenteredConnectException; import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock; +import org.apache.logging.log4j.Logger; + +import java.io.*; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.*; /** * The <code>DistributionManager</code> uses a {@link @@ -208,8 +164,8 @@ public class DistributionManager * * Added for normura issue 7033 - they have duplicate link local addresses on different boxes */ - public static volatile boolean INCLUDE_LINK_LOCAL_ADDRESSES = - Boolean.getBoolean("gemfire.IncludeLinkLocalAddresses"); + public static volatile boolean INCLUDE_LINK_LOCAL_ADDRESSES = + Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "IncludeLinkLocalAddresses"); /** The DM type for regular distribution managers */ public static final int NORMAL_DM_TYPE = 10; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FunctionExecutionPooledExecutor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FunctionExecutionPooledExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FunctionExecutionPooledExecutor.java index 92adb7a..86127b4 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FunctionExecutionPooledExecutor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FunctionExecutionPooledExecutor.java @@ -17,21 +17,11 @@ package com.gemstone.gemfire.distributed.internal; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.ThreadFactory; - import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LocalLogWriter; -import com.gemstone.gemfire.internal.logging.LogWriterImpl; import java.util.List; +import java.util.concurrent.*; /** * A ThreadPoolExecutor with stat support. This executor also has a @@ -146,7 +136,7 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor { public FunctionExecutionPooledExecutor(BlockingQueue<Runnable> q, int maxPoolSize, PoolStatHelper stats, ThreadFactory tf, int msTimeout, final boolean forFnExec) { this(initQ(q), maxPoolSize, stats, tf, msTimeout, initREH(q,forFnExec)); - final int retryFor = Integer.getInteger("gemfire.RETRY_INTERVAL", 5000).intValue(); + final int retryFor = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "RETRY_INTERVAL", 5000).intValue(); if (!(q instanceof SynchronousQueue)) { this.bufferQueue = q; // create a thread that takes from bufferQueue and puts into result @@ -216,7 +206,7 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor { * from its thread pool. Default is (30000 * 60) ms (30 minutes). * It is not static so it can be set at runtime and pick up different values. */ - this(q, poolSize, stats, tf, Integer.getInteger("gemfire.IDLE_THREAD_TIMEOUT", 30000*60), false /* not for fn exec*/); + this(q, poolSize, stats, tf, Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "IDLE_THREAD_TIMEOUT", 30000 * 60), false /* not for fn exec*/); } public FunctionExecutionPooledExecutor(BlockingQueue<Runnable> q, int poolSize, PoolStatHelper stats, ThreadFactory tf, boolean forFnExec) { @@ -225,7 +215,7 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor { * from its thread pool. Default is (30000 * 60) ms (30 minutes). * It is not static so it can be set at runtime and pick up different values. */ - this(q, poolSize, stats, tf, Integer.getInteger("gemfire.IDLE_THREAD_TIMEOUT", 30000*60), forFnExec); + this(q, poolSize, stats, tf, Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "IDLE_THREAD_TIMEOUT", 30000 * 60), forFnExec); } /** * Default timeout with no stats. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java index 76a49db..9439fbb 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java @@ -17,42 +17,7 @@ package com.gemstone.gemfire.distributed.internal; -import java.io.File; -import java.io.IOException; -import java.io.Reader; -import java.lang.reflect.Array; -import java.lang.reflect.Method; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.SortedSet; -import java.util.StringTokenizer; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.SystemFailure; +import com.gemstone.gemfire.*; import com.gemstone.gemfire.admin.AlertLevel; import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.CacheFactory; @@ -69,21 +34,7 @@ import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; import com.gemstone.gemfire.distributed.internal.membership.gms.Services; import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.DummyStatisticsImpl; -import com.gemstone.gemfire.internal.GemFireStatSampler; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.InternalInstantiator; -import com.gemstone.gemfire.internal.LinuxProcFsStatistics; -import com.gemstone.gemfire.internal.LocalStatisticsImpl; -import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.OsStatisticsFactory; -import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.StatisticsImpl; -import com.gemstone.gemfire.internal.StatisticsManager; -import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; -import com.gemstone.gemfire.internal.SystemTimer; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; import com.gemstone.gemfire.internal.cache.CacheConfig; import com.gemstone.gemfire.internal.cache.CacheServerImpl; @@ -109,6 +60,21 @@ import com.gemstone.gemfire.internal.util.concurrent.StoppableCondition; import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock; import com.gemstone.gemfire.management.ManagementException; import com.gemstone.gemfire.security.GemFireSecurityException; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.lang.reflect.Array; +import java.net.InetAddress; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * The concrete implementation of {@link DistributedSystem} that @@ -122,8 +88,8 @@ public class InternalDistributedSystem implements OsStatisticsFactory, StatisticsManager { private static final Logger logger = LogService.getLogger(); - - public static final String DISABLE_MANAGEMENT_PROPERTY = "gemfire.disableManagement"; + + public static final String DISABLE_MANAGEMENT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "disableManagement"; /** * If auto-reconnect is going on this will hold a reference to it @@ -232,12 +198,12 @@ public class InternalDistributedSystem * A property to prevent shutdown hooks from being registered with the VM. * This is regarding bug 38407 */ - public final static String DISABLE_SHUTDOWN_HOOK_PROPERTY = "gemfire.disableShutdownHook"; + public final static String DISABLE_SHUTDOWN_HOOK_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "disableShutdownHook"; /** * A property to append to existing log-file instead of truncating it. */ - public final static String APPEND_TO_LOG_FILE = "gemfire.append-log"; + public final static String APPEND_TO_LOG_FILE = DistributionConfig.GEMFIRE_PREFIX + "append-log"; //////////////////// Configuration Fields //////////////////// @@ -247,7 +213,7 @@ public class InternalDistributedSystem /** The config object to which most configuration work is delegated */ private DistributionConfig config; - private final boolean statsDisabled = Boolean.getBoolean("gemfire.statsDisabled"); + private final boolean statsDisabled = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "statsDisabled"); private volatile boolean shareSockets = DistributionConfig.DEFAULT_CONSERVE_SOCKETS; @@ -534,9 +500,9 @@ public class InternalDistributedSystem if (this.originalConfig.getLocators().equals("")) { if (this.originalConfig.getMcastPort() != 0) { throw new GemFireConfigException("The " - + DistributionConfig.LOCATORS_NAME + + LOCATORS + " attribute can not be empty when the " - + DistributionConfig.MCAST_PORT_NAME + + MCAST_PORT + " attribute is non-zero."); } else { // no distribution http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java index 9d8e58c..7bc65c8 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java @@ -16,36 +16,11 @@ */ package com.gemstone.gemfire.distributed.internal; -import java.io.File; -import java.io.IOException; -import java.net.ConnectException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionRequest; -import com.gemstone.gemfire.cache.client.internal.locator.ClientReplacementRequest; -import com.gemstone.gemfire.cache.client.internal.locator.GetAllServersRequest; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorListRequest; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusRequest; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse; -import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionRequest; -import com.gemstone.gemfire.cache.client.internal.locator.ServerLocationRequest; +import com.gemstone.gemfire.cache.client.internal.locator.*; import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.Locator; @@ -82,6 +57,22 @@ import com.gemstone.gemfire.management.internal.configuration.handlers.SharedCon import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationRequest; import com.gemstone.gemfire.management.internal.configuration.messages.SharedConfigurationStatusRequest; import com.gemstone.gemfire.management.internal.configuration.messages.SharedConfigurationStatusResponse; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.net.ConnectException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.BIND_ADDRESS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; /** * Provides the implementation of a distribution <code>Locator</code> @@ -123,7 +114,7 @@ public class InternalLocator extends Locator implements ConnectListener { public static final String INHIBIT_DM_BANNER = "Locator.inhibitDMBanner"; /** system property name for forcing locators to be preferred as coordinators */ - public static final String LOCATORS_PREFERRED_AS_COORDINATORS = "gemfire.disable-floating-coordinator"; + public static final String LOCATORS_PREFERRED_AS_COORDINATORS = DistributionConfig.GEMFIRE_PREFIX + "disable-floating-coordinator"; ///////////////////// Instance Fields ////////////////////// @@ -543,7 +534,7 @@ public class InternalLocator extends Locator implements ConnectListener { // set bind-address explicitly only if not wildcard and let any explicit // value in distributedSystemProperties take precedence (#46870) if (bindAddress != null && !bindAddress.isAnyLocalAddress()) { - env.setProperty(DistributionConfig.BIND_ADDRESS_NAME, + env.setProperty(BIND_ADDRESS, bindAddress.getHostAddress()); } @@ -752,11 +743,11 @@ public class InternalLocator extends Locator implements ConnectListener { } if (setLocatorsProp) { Properties updateEnv = new Properties(); - updateEnv.setProperty(DistributionConfig.LOCATORS_NAME, locatorsProp); + updateEnv.setProperty(LOCATORS, locatorsProp); this.config.setApiProps(updateEnv); // fix for bug 41248 String propName = DistributionConfig.GEMFIRE_PREFIX + - DistributionConfig.LOCATORS_NAME; + LOCATORS; if (System.getProperty(propName) != null) { System.setProperty(propName, locatorsProp); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java index 6cad358..8970fda 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java @@ -16,15 +16,13 @@ */ package com.gemstone.gemfire.distributed.internal; +import com.gemstone.gemfire.*; +import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; + import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; /** * This class maintains statistics for the locator @@ -32,9 +30,8 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; */ public class LocatorStats { private static StatisticsType type; - - - private static final String KNOWN_LOCATORS = "locators"; // gauge + + private static final String KNOWN_LOCATORS = LOCATORS; // gauge private static final String REQUESTS_TO_LOCATOR = "locatorRequests"; // counter private static final String RESPONSES_FROM_LOCATOR = "locatorResponses"; // counter private static final String ENDPOINTS_KNOWN = "servers"; // gauge @@ -74,7 +71,7 @@ public class LocatorStats { statName, statDescription, new StatisticDescriptor[] { - f.createIntGauge(KNOWN_LOCATORS, "Number of locators known to this locator", "locators"), + f.createIntGauge(KNOWN_LOCATORS, "Number of locators known to this locator", LOCATORS), f.createLongCounter(REQUESTS_TO_LOCATOR, "Number of requests this locator has received from clients", "requests"), f.createLongCounter(RESPONSES_FROM_LOCATOR, "Number of responses this locator has sent to clients", "responses"), f.createIntGauge(ENDPOINTS_KNOWN, "Number of servers this locator knows about", "servers"), http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java index 3920267..7f8eed6 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java @@ -16,28 +16,6 @@ */ package com.gemstone.gemfire.distributed.internal; -import java.io.Serializable; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.Vector; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.InternalGemFireError; import com.gemstone.gemfire.distributed.DistributedMember; @@ -53,6 +31,12 @@ import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.InternalLogWriter; +import java.io.Serializable; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.*; + /** * A <code>LonerDistributionManager</code> is a dm that never communicates * with anyone else. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java index 3909474..5bb82f0 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java @@ -17,18 +17,12 @@ package com.gemstone.gemfire.distributed.internal; -import java.util.List; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import java.util.List; +import java.util.concurrent.*; + /** * A ThreadPoolExecutor with stat support. * @@ -148,7 +142,7 @@ public class PooledExecutorWithDMStats extends ThreadPoolExecutor { * from its thread pool. Default is (30000 * 60) ms (30 minutes). * It is not static so it can be set at runtime and pick up different values. */ - this(q, poolSize, stats, tf, Integer.getInteger("gemfire.IDLE_THREAD_TIMEOUT", 30000*60).intValue()); + this(q, poolSize, stats, tf, Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "IDLE_THREAD_TIMEOUT", 30000 * 60).intValue()); } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java index 5705689..49e11df 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java @@ -17,15 +17,6 @@ package com.gemstone.gemfire.distributed.internal; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.InternalGemFireException; import com.gemstone.gemfire.cache.TimeoutException; @@ -33,6 +24,7 @@ import com.gemstone.gemfire.cache.UnsupportedVersionException; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.internal.deadlock.MessageDependencyMonitor; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import com.gemstone.gemfire.i18n.StringId; import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.DSFIDNotFoundException; import com.gemstone.gemfire.internal.Version; @@ -42,7 +34,9 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.util.Breadcrumbs; import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch; -import com.gemstone.gemfire.i18n.StringId; +import org.apache.logging.log4j.Logger; + +import java.util.*; /** * This class processes responses to {@link DistributionMessage}s. It @@ -181,7 +175,7 @@ public class ReplyProcessor21 ////////////////////// Static Methods ///////////////////// static { - String str = System.getProperty("gemfire.ack-severe-alert-reduction-ratio", ".80"); + String str = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "ack-severe-alert-reduction-ratio", ".80"); double ratio; try { ratio = Double.parseDouble(str); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java index 6df3dfe..05810e5 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java @@ -16,27 +16,23 @@ */ package com.gemstone.gemfire.distributed.internal; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.net.InetAddress; -import java.util.Collection; -import java.util.Collections; -import java.util.Properties; -import java.util.Set; - -import com.gemstone.gemfire.internal.*; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.Instantiator; import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.internal.InternalDataSerializer; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder; import com.gemstone.gemfire.internal.InternalInstantiator.InstantiatorAttributesHolder; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.logging.log4j.Logger; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.net.InetAddress; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; /** * A message that is sent to all other distribution manager when @@ -213,12 +209,12 @@ public final class StartupMessage extends HighPriorityDistributionMessage implem rejectionMessage = LocalizedStrings.StartupMessage_REJECTED_NEW_SYSTEM_NODE_0_BECAUSE_ISTCPDISABLED_1_DOES_NOT_MATCH_THE_DISTRIBUTED_SYSTEM_IT_IS_ATTEMPTING_TO_JOIN .toLocalizedString(new Object[] {getSender(), Boolean.valueOf(isTcpDisabled)}); - } - else if (dm.getDistributedSystemId() != DistributionConfig.DEFAULT_DISTRIBUTED_SYSTEM_ID && distributedSystemId != DistributionConfig.DEFAULT_DISTRIBUTED_SYSTEM_ID + } else if (dm.getDistributedSystemId() != DistributionConfig.DEFAULT_DISTRIBUTED_SYSTEM_ID + && distributedSystemId != DistributionConfig.DEFAULT_DISTRIBUTED_SYSTEM_ID && distributedSystemId != dm.getDistributedSystemId()) { String distributedSystemListener = System - .getProperty("gemfire.DistributedSystemListener"); + .getProperty(DistributionConfig.GEMFIRE_PREFIX + "DistributedSystemListener"); //this check is specific for Jayesh's use case of WAN BootStraping if(distributedSystemListener != null){ if(-distributedSystemId != dm.getDistributedSystemId()){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java index ac41d1c..f1caa5d 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java @@ -17,57 +17,32 @@ package com.gemstone.gemfire.distributed.internal.direct; -import java.io.IOException; -import java.io.NotSerializableException; -import java.net.InetAddress; -import java.net.SocketTimeoutException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.Semaphore; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.ToDataException; +import com.gemstone.gemfire.*; import com.gemstone.gemfire.cache.TimeoutException; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DirectReplyProcessor; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; import com.gemstone.gemfire.i18n.StringId; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.cache.DirectReplyMessage; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.tcp.BaseMsgStreamer; -import com.gemstone.gemfire.internal.tcp.ConnectExceptions; -import com.gemstone.gemfire.internal.tcp.Connection; -import com.gemstone.gemfire.internal.tcp.ConnectionException; -import com.gemstone.gemfire.internal.tcp.MemberShunnedException; -import com.gemstone.gemfire.internal.tcp.MsgStreamer; -import com.gemstone.gemfire.internal.tcp.TCPConduit; +import com.gemstone.gemfire.internal.tcp.*; import com.gemstone.gemfire.internal.util.Breadcrumbs; import com.gemstone.gemfire.internal.util.concurrent.ReentrantSemaphore; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.io.NotSerializableException; +import java.net.InetAddress; +import java.net.SocketTimeoutException; +import java.util.*; +import java.util.concurrent.Semaphore; /** * DirectChannel is used to interact directly with other Direct servers to @@ -132,7 +107,7 @@ public class DirectChannel { } public DirectChannel(MembershipManager mgr, DirectChannelListener listener, - DistributionConfig dc) + DistributionConfig dc) throws ConnectionException { this.receiver = listener; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java index 969335a..d02580e 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java @@ -17,27 +17,13 @@ package com.gemstone.gemfire.distributed.internal.locks; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.cache.CommitConflictException; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.LockServiceDestroyedException; import com.gemstone.gemfire.distributed.internal.DM; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.MembershipListener; import com.gemstone.gemfire.distributed.internal.locks.DLockQueryProcessor.DLockQueryMessage; import com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage; @@ -51,6 +37,11 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch; import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantReadWriteLock; +import org.apache.logging.log4j.Logger; + +import java.util.*; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.atomic.AtomicLong; /** * Provides lock grantor authority to a distributed lock service. This is @@ -66,7 +57,7 @@ public class DLockGrantor { public static final boolean DEBUG_SUSPEND_LOCK = // TODO:LOG:CONVERT: REMOVE THIS Boolean.getBoolean( - "gemfire.DLockService.DLockGrantor.debugSuspendLock"); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.DLockGrantor.debugSuspendLock"); /** * Default wait before grantor thread will reawaken to check for expirations http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java index c0c97ff..5e9d3c5 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java @@ -17,33 +17,10 @@ package com.gemstone.gemfire.distributed.internal.locks; -import java.io.DataInput; -import java.io.DataOutput; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CancellationException; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.distributed.DistributedLockService; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.LeaseExpiredException; -import com.gemstone.gemfire.distributed.LockNotHeldException; -import com.gemstone.gemfire.distributed.LockServiceDestroyedException; +import com.gemstone.gemfire.*; +import com.gemstone.gemfire.distributed.*; import com.gemstone.gemfire.distributed.internal.DM; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.ResourceEvent; import com.gemstone.gemfire.distributed.internal.deadlock.UnsafeThreadLocal; @@ -60,6 +37,13 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.util.StopWatch; import com.gemstone.gemfire.internal.util.concurrent.FutureResult; +import org.apache.logging.log4j.Logger; + +import java.io.DataInput; +import java.io.DataOutput; +import java.util.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.atomic.AtomicInteger; /** * Implements the distributed locking service with distributed lock grantors. @@ -70,28 +54,28 @@ public class DLockService extends DistributedLockService { private static final Logger logger = LogService.getLogger(); public static final long NOT_GRANTOR_SLEEP = Long.getLong( - "gemfire.DLockService.notGrantorSleep", 100).longValue(); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.notGrantorSleep", 100).longValue(); public static final boolean DEBUG_DISALLOW_NOT_HOLDER = Boolean.getBoolean( - "gemfire.DLockService.debug.disallowNotHolder"); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.debug.disallowNotHolder"); public static final boolean DEBUG_LOCK_REQUEST_LOOP = Boolean.getBoolean( - "gemfire.DLockService.debug.disallowLockRequestLoop"); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.debug.disallowLockRequestLoop"); public static final int DEBUG_LOCK_REQUEST_LOOP_COUNT = Integer.getInteger( - "gemfire.DLockService.debug.disallowLockRequestLoopCount", 20).intValue(); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.debug.disallowLockRequestLoopCount", 20).intValue(); public static final boolean DEBUG_NONGRANTOR_DESTROY_LOOP = Boolean.getBoolean( - "gemfire.DLockService.debug.nonGrantorDestroyLoop"); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.debug.nonGrantorDestroyLoop"); public static final int DEBUG_NONGRANTOR_DESTROY_LOOP_COUNT = Integer.getInteger( - "gemfire.DLockService.debug.nonGrantorDestroyLoopCount", 20).intValue(); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.debug.nonGrantorDestroyLoopCount", 20).intValue(); public static final boolean DEBUG_ENFORCE_SAFE_EXIT = Boolean.getBoolean( - "gemfire.DLockService.debug.enforceSafeExit"); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.debug.enforceSafeExit"); public static final boolean AUTOMATE_FREE_RESOURCES = Boolean.getBoolean( - "gemfire.DLockService.automateFreeResources"); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.automateFreeResources"); public static final int INVALID_LEASE_ID = -1; @@ -2904,7 +2888,7 @@ public class DLockService extends DistributedLockService { * Specifies the starting serial number for the serialNumberSequencer */ public static final int START_SERIAL_NUMBER = Integer.getInteger( - "gemfire.DistributedLockService.startSerialNumber", 1).intValue(); + DistributionConfig.GEMFIRE_PREFIX + "DistributedLockService.startSerialNumber", 1).intValue(); /** * Incrementing serial number used to identify order of DLS creation http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java index 49fdd07..448c382 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java @@ -17,6 +17,7 @@ package com.gemstone.gemfire.distributed.internal.locks; import com.gemstone.gemfire.distributed.internal.DM; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; @@ -28,7 +29,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; public class LockGrantorId { public static final int ROLLOVER_MARGIN = Integer.getInteger( - "gemfire.DLockService.LockGrantorId.rolloverMargin", 10000).intValue(); + DistributionConfig.GEMFIRE_PREFIX + "DLockService.LockGrantorId.rolloverMargin", 10000).intValue(); private final DM dm; private final InternalDistributedMember lockGrantorMember; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java index a63cfb4..2d8b8e1 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java @@ -16,22 +16,6 @@ */ package com.gemstone.gemfire.distributed.internal.membership; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.EOFException; -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.InternalGemFireError; import com.gemstone.gemfire.cache.UnsupportedVersionException; @@ -39,16 +23,18 @@ import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DurableClientAttributes; import com.gemstone.gemfire.distributed.Role; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.ProfileId; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.Version; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import java.io.*; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; + /** * This is the fundamental representation of a member of a GemFire distributed * system. @@ -61,7 +47,7 @@ public class InternalDistributedMember private final static long serialVersionUID = -2785249969777296507L; // whether to show NetMember components in toString() - private final boolean SHOW_NETMEMBER = Boolean.getBoolean("gemfire.show_netmembers"); + private final boolean SHOW_NETMEMBER = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "show_netmembers"); protected NetMember netMbr; // the underlying member object, e.g. from JGroups http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberFactory.java index c2223f8..013ef35 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberFactory.java @@ -16,9 +16,6 @@ */ package com.gemstone.gemfire.distributed.internal.membership; -import java.io.File; -import java.net.InetAddress; - import com.gemstone.gemfire.distributed.internal.DMStats; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.LocatorStats; @@ -26,6 +23,9 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMemberFactory import com.gemstone.gemfire.distributed.internal.membership.gms.NetLocator; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import java.io.File; +import java.net.InetAddress; + /** * Create a new Member based on the given inputs. * TODO: need to implement a real factory implementation based on gemfire.properties http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java index a1240f4..7f48e46 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java @@ -16,16 +16,15 @@ */ package com.gemstone.gemfire.distributed.internal.membership; -import java.io.File; -import java.net.InetAddress; - -import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.distributed.internal.DMStats; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.LocatorStats; import com.gemstone.gemfire.distributed.internal.membership.gms.NetLocator; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import java.io.File; +import java.net.InetAddress; + /** * This is the SPI for a provider of membership services. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java index 6089eb8..d5d0b8e 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember.java @@ -16,21 +16,21 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.jgroups.util.UUID; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.distributed.DurableClientAttributes; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; import com.gemstone.gemfire.distributed.internal.membership.NetMember; import com.gemstone.gemfire.internal.DataSerializableFixedID; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.jgroups.util.UUID; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; /** * This is the fundamental representation of a member of a GemFire distributed system. @@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; */ public class GMSMember implements NetMember, DataSerializableFixedID { // whether to show UUID info in toString() - private final static boolean SHOW_UUIDS = Boolean.getBoolean("gemfire.show_UUIDs"); + private final static boolean SHOW_UUIDS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "show_UUIDs"); private int udpPort=0; private boolean preferredForCoordinator; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMemberFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMemberFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMemberFactory.java index 2063d7c..4328bed 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMemberFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/GMSMemberFactory.java @@ -16,21 +16,13 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms; -import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; - import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.SystemConnectException; import com.gemstone.gemfire.distributed.internal.DMStats; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionException; import com.gemstone.gemfire.distributed.internal.LocatorStats; -import com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener; -import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; -import com.gemstone.gemfire.distributed.internal.membership.MemberServices; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.membership.NetMember; +import com.gemstone.gemfire.distributed.internal.membership.*; import com.gemstone.gemfire.distributed.internal.membership.gms.locator.GMSLocator; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.Version; @@ -40,6 +32,10 @@ import com.gemstone.gemfire.internal.tcp.ConnectionException; import com.gemstone.gemfire.security.AuthenticationFailedException; import com.gemstone.gemfire.security.AuthenticationRequiredException; +import java.io.File; +import java.net.InetAddress; +import java.net.UnknownHostException; + /** * Create a new Member based on the given inputs. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/ServiceConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/ServiceConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/ServiceConfig.java index 3a48c3f..2a41574 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/ServiceConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/ServiceConfig.java @@ -16,19 +16,18 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms; -import java.net.InetAddress; - import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.distributed.internal.membership.gms.membership.GMSJoinLeave; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import java.net.InetAddress; + public class ServiceConfig { /** stall time to wait for concurrent join/leave/remove requests to be received */ - public static final long MEMBER_REQUEST_COLLECTION_INTERVAL = Long.getLong("gemfire.member-request-collection-interval", 300); + public static final long MEMBER_REQUEST_COLLECTION_INTERVAL = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "member-request-collection-interval", 300); /** various settings from Geode configuration */ private long joinTimeout; @@ -190,13 +189,13 @@ public class ServiceConfig { } else if (ackCollectionTimeout > 12437) { ackCollectionTimeout = 12437; } - ackCollectionTimeout = Integer.getInteger("gemfire.VIEW_ACK_TIMEOUT", ackCollectionTimeout).intValue(); + ackCollectionTimeout = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "VIEW_ACK_TIMEOUT", ackCollectionTimeout).intValue(); - lossThreshold = Integer.getInteger("gemfire.network-partition-threshold", 51); + lossThreshold = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "network-partition-threshold", 51); if (lossThreshold < 51) lossThreshold = 51; if (lossThreshold > 100) lossThreshold = 100; - - memberWeight = Integer.getInteger("gemfire.member-weight", 0); + + memberWeight = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "member-weight", 0); locatorWaitTime = theConfig.getLocatorWaitTime(); networkPartitionDetectionEnabled = theConfig.getEnableNetworkPartitionDetection(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java index 4f5a1a4..bc59180 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java @@ -16,10 +16,6 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms; -import java.util.Timer; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.ForcedDisconnectException; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; @@ -32,12 +28,7 @@ import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; import com.gemstone.gemfire.distributed.internal.membership.NetView; import com.gemstone.gemfire.distributed.internal.membership.gms.auth.GMSAuthenticator; import com.gemstone.gemfire.distributed.internal.membership.gms.fd.GMSHealthMonitor; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Authenticator; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.HealthMonitor; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.JoinLeave; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Locator; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Manager; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Messenger; +import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.*; import com.gemstone.gemfire.distributed.internal.membership.gms.membership.GMSJoinLeave; import com.gemstone.gemfire.distributed.internal.membership.gms.messenger.JGroupsMessenger; import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; @@ -46,6 +37,9 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; import com.gemstone.gemfire.security.AuthenticationFailedException; +import org.apache.logging.log4j.Logger; + +import java.util.Timer; public class Services { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java index 741eb2c..6fca8b7 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java @@ -18,6 +18,8 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.auth; import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.distributed.internal.membership.NetView; import com.gemstone.gemfire.distributed.internal.membership.gms.Services; @@ -35,22 +37,14 @@ import java.security.Principal; import java.util.Properties; import java.util.Set; +import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.*; // static messages -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.HandShake_AUTHENTICATOR_INSTANCE_COULD_NOT_BE_OBTAINED; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHENTICATOR_OBJECT; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.HandShake_FAILED_TO_ACQUIRE_AUTHINITIALIZE_METHOD_0; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.AUTH_PEER_AUTHENTICATION_FAILED_WITH_EXCEPTION; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.AUTH_PEER_AUTHENTICATION_FAILED; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.AUTH_PEER_AUTHENTICATION_MISSING_CREDENTIALS; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.AUTH_FAILED_TO_ACQUIRE_AUTHINITIALIZE_INSTANCE; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME; public class GMSAuthenticator implements Authenticator { - private final static String secPrefix = "gemfire.sys.security-"; - private final static int gemfireSysPrefixLen = "gemfire.sys.".length(); + private final static String secPrefix = DistributionConfig.GEMFIRE_PREFIX + "sys.security-"; + private final static int gemfireSysPrefixLen = (DistributionConfig.GEMFIRE_PREFIX + "sys.").length(); private Services services; private Properties securityProps = getSecurityProps(); @@ -119,7 +113,7 @@ public class GMSAuthenticator implements Authenticator { */ String authenticate(DistributedMember member, Object credentials, Properties secProps, DistributedMember localMember) throws AuthenticationFailedException { - String authMethod = secProps.getProperty(SECURITY_PEER_AUTHENTICATOR_NAME); + String authMethod = secProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTHENTICATOR); if (authMethod == null || authMethod.length() == 0) { return null; } @@ -186,7 +180,7 @@ public class GMSAuthenticator implements Authenticator { return getCredentials(member, securityProps); } catch (Exception e) { - String authMethod = securityProps.getProperty(SECURITY_PEER_AUTH_INIT_NAME); + String authMethod = securityProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT); services.getSecurityLogWriter().warning(LocalizedStrings.AUTH_FAILED_TO_OBTAIN_CREDENTIALS_IN_0_USING_AUTHINITIALIZE_1_2, new Object[] { authMethod, e.getLocalizedMessage() }); return null; } @@ -197,7 +191,7 @@ public class GMSAuthenticator implements Authenticator { */ Properties getCredentials(DistributedMember member, Properties secProps) { Properties credentials = null; - String authMethod = secProps.getProperty(SECURITY_PEER_AUTH_INIT_NAME); + String authMethod = secProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT); try { if (authMethod != null && authMethod.length() > 0) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java index e12740e..d618dce 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java @@ -35,7 +35,6 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoor import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse; import com.gemstone.gemfire.distributed.internal.membership.gms.messages.*; import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; -import com.gemstone.gemfire.internal.CopyOnWriteHashSet; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.security.AuthenticationFailedException; @@ -47,6 +46,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR; import static com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL; import static com.gemstone.gemfire.internal.DataSerializableFixedID.*; @@ -57,32 +58,32 @@ import static com.gemstone.gemfire.internal.DataSerializableFixedID.*; */ public class GMSJoinLeave implements JoinLeave, MessageHandler { - public static final String BYPASS_DISCOVERY_PROPERTY = "gemfire.bypass-discovery"; + public static final String BYPASS_DISCOVERY_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "bypass-discovery"; /** * amount of time to wait for responses to FindCoordinatorRequests */ - private static final int DISCOVERY_TIMEOUT = Integer.getInteger("gemfire.discovery-timeout", 3000); + private static final int DISCOVERY_TIMEOUT = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "discovery-timeout", 3000); /** * amount of time to sleep before trying to join after a failed attempt */ - private static final int JOIN_RETRY_SLEEP = Integer.getInteger("gemfire.join-retry-sleep", 1000); + private static final int JOIN_RETRY_SLEEP = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "join-retry-sleep", 1000); /** * time to wait for a broadcast message to be transmitted by jgroups */ - private static final long BROADCAST_MESSAGE_SLEEP_TIME = Long.getLong("gemfire.broadcast-message-sleep-time", 1000); + private static final long BROADCAST_MESSAGE_SLEEP_TIME = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "broadcast-message-sleep-time", 1000); /** * if the locators don't know who the coordinator is we send find-coord requests to this many nodes */ - private static final int MAX_DISCOVERY_NODES = Integer.getInteger("gemfire.max-discovery-nodes", 30); + private static final int MAX_DISCOVERY_NODES = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "max-discovery-nodes", 30); /** * interval for broadcasting the current view to members in case they didn't get it the first time */ - private static final long VIEW_BROADCAST_INTERVAL = Long.getLong("gemfire.view-broadcast-interval", 60000); + private static final long VIEW_BROADCAST_INTERVAL = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "view-broadcast-interval", 60000); /** * membership logger @@ -1491,7 +1492,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler { if (dc.getMcastPort() != 0 && dc.getLocators().trim().isEmpty() && dc.getStartLocator().trim().isEmpty()) { throw new GemFireConfigException( "Multicast cannot be configured for a non-distributed cache." + " Please configure the locator services for this cache using " - + DistributionConfig.LOCATORS_NAME + " or " + DistributionConfig.START_LOCATOR_NAME + "."); + + LOCATORS + " or " + START_LOCATOR + "."); } services.getMessenger().addHandler(JoinRequestMessage.class, this); @@ -1512,7 +1513,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler { } else if (ackCollectionTimeout > 12437) { ackCollectionTimeout = 12437; } - ackCollectionTimeout = Integer.getInteger("gemfire.VIEW_ACK_TIMEOUT", ackCollectionTimeout).intValue(); + ackCollectionTimeout = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "VIEW_ACK_TIMEOUT", ackCollectionTimeout).intValue(); this.viewAckTimeout = ackCollectionTimeout; this.quorumRequired = services.getConfig().getDistributionConfig().getEnableNetworkPartitionDetection(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGAddress.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGAddress.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGAddress.java index 6ddafa0..1f97001 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGAddress.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGAddress.java @@ -16,24 +16,18 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms.messenger; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.net.Inet4Address; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.jgroups.Address; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; +import com.gemstone.gemfire.internal.SocketCreator; import org.jgroups.Global; import org.jgroups.stack.IpAddress; import org.jgroups.util.UUID; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; -import com.gemstone.gemfire.internal.SocketCreator; +import java.io.*; +import java.net.Inet4Address; +import java.net.Inet6Address; +import java.net.InetAddress; /** * This is a copy of JGroups 3.6.4 IpAddress (Apache 2.0 License) @@ -46,7 +40,7 @@ public class JGAddress extends UUID { private static final long serialVersionUID=-1818672332115113291L; // whether to show UUID info in toString() - private final static boolean SHOW_UUIDS = Boolean.getBoolean("gemfire.show_UUIDs"); + private final static boolean SHOW_UUIDS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "show_UUIDs"); private InetAddress ip_addr; private int port; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java index 0460964..fc81049 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java @@ -16,62 +16,10 @@ */ package com.gemstone.gemfire.distributed.internal.membership.gms.messenger; -import static com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil.replaceStrings; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_REQUEST; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_RESPONSE; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.logging.log4j.Logger; -import org.jgroups.Address; -import org.jgroups.Event; -import org.jgroups.JChannel; -import org.jgroups.Message; -import org.jgroups.Message.Flag; -import org.jgroups.Message.TransientFlag; -import org.jgroups.ReceiverAdapter; -import org.jgroups.View; -import org.jgroups.ViewId; -import org.jgroups.conf.ClassConfigurator; -import org.jgroups.protocols.UDP; -import org.jgroups.protocols.pbcast.NAKACK2; -import org.jgroups.stack.IpAddress; -import org.jgroups.util.Digest; -import org.jgroups.util.UUID; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.SystemConnectException; +import com.gemstone.gemfire.*; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.DistributionStats; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; import com.gemstone.gemfire.distributed.internal.membership.NetView; @@ -82,12 +30,8 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Messa import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Messenger; import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinRequestMessage; import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinResponseMessage; -import com.gemstone.gemfire.internal.ClassPathLoader; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.SocketCreator; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.VersionedDataInputStream; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; import com.gemstone.gemfire.internal.cache.DirectReplyMessage; import com.gemstone.gemfire.internal.cache.DistributedCacheOperation; @@ -95,8 +39,30 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.tcp.MemberShunnedException; - import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +import org.apache.logging.log4j.Logger; +import org.jgroups.*; +import org.jgroups.Message.Flag; +import org.jgroups.Message.TransientFlag; +import org.jgroups.conf.ClassConfigurator; +import org.jgroups.protocols.UDP; +import org.jgroups.protocols.pbcast.NAKACK2; +import org.jgroups.stack.IpAddress; +import org.jgroups.util.Digest; +import org.jgroups.util.UUID; + +import java.io.*; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; + +import static com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil.replaceStrings; +import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_REQUEST; +import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_RESPONSE; public class JGroupsMessenger implements Messenger { @@ -209,7 +175,8 @@ public class JGroupsMessenger implements Messenger { properties = replaceStrings(properties, "MCAST_TTL", String.valueOf(dc.getMcastTtl())); properties = replaceStrings(properties, "MCAST_SEND_BUFFER_SIZE", String.valueOf(dc.getMcastSendBufferSize())); properties = replaceStrings(properties, "MCAST_RECV_BUFFER_SIZE", String.valueOf(dc.getMcastRecvBufferSize())); - properties = replaceStrings(properties, "MCAST_RETRANSMIT_INTERVAL", ""+Integer.getInteger("gemfire.mcast-retransmit-interval", 500)); + properties = replaceStrings(properties, "MCAST_RETRANSMIT_INTERVAL", + "" + Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "mcast-retransmit-interval", 500)); properties = replaceStrings(properties, "RETRANSMIT_LIMIT", String.valueOf(dc.getUdpFragmentSize()-256)); } @@ -233,7 +200,7 @@ public class JGroupsMessenger implements Messenger { } properties = replaceStrings(properties, "BIND_ADDR_SETTING", "bind_addr=\""+str+"\""); - int port = Integer.getInteger("gemfire.jg-bind-port", 0); + int port = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "jg-bind-port", 0); if (port != 0) { properties = replaceStrings(properties, "MEMBERSHIP_PORT_RANGE_START", ""+port); properties = replaceStrings(properties, "MEMBERSHIP_PORT_RANGE", ""+0);
