http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RootRegionResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RootRegionResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RootRegionResponse.java index d3a66a7..bc1dbb7 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RootRegionResponse.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RootRegionResponse.java @@ -18,15 +18,26 @@ package com.gemstone.gemfire.internal.admin.remote; -import com.gemstone.gemfire.*; -import com.gemstone.gemfire.cache.*; -//import com.gemstone.gemfire.internal.*; -import com.gemstone.gemfire.internal.admin.*; +import com.gemstone.gemfire.CancelException; +import com.gemstone.gemfire.DataSerializer; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.internal.DistributionManager; +import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import com.gemstone.gemfire.internal.admin.GemFireVM; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.distributed.internal.*; -import java.io.*; -import java.util.*; -import com.gemstone.gemfire.distributed.internal.membership.*; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +//import com.gemstone.gemfire.internal.*; /** * Responds to {@link RootRegionResponse}. @@ -47,7 +58,7 @@ public final class RootRegionResponse extends AdminResponse { try { Cache cache = CacheFactory.getInstance(dm.getSystem()); final Collection roots; - if (! Boolean.getBoolean("gemfire.PRDebug")) { + if (!Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "PRDebug")) { roots = cache.rootRegions(); } else { roots = ((GemFireCacheImpl)cache).rootRegions(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java index 4d5e3ac..1b80844 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllRequest.java @@ -16,32 +16,20 @@ */ package com.gemstone.gemfire.internal.admin.remote; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.InternalGemFireError; import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.tcp.ConnectionTable; +import org.apache.logging.log4j.Logger; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.*; /** * An instruction to all members with cache that their PR should gracefully @@ -51,8 +39,8 @@ import com.gemstone.gemfire.internal.tcp.ConnectionTable; public class ShutdownAllRequest extends AdminRequest { private static final Logger logger = LogService.getLogger(); - - static final long SLEEP_TIME_BEFORE_DISCONNECT_DS = Long.getLong("gemfire.sleep-before-disconnect-ds", 1000).longValue(); + + static final long SLEEP_TIME_BEFORE_DISCONNECT_DS = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "sleep-before-disconnect-ds", 1000).longValue(); public ShutdownAllRequest() { } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/TailLogResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/TailLogResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/TailLogResponse.java index 65f8756..6a210ca 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/TailLogResponse.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/TailLogResponse.java @@ -18,28 +18,22 @@ package com.gemstone.gemfire.internal.admin.remote; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.File; -//import com.gemstone.gemfire.distributed.DistributedSystem; -import java.io.IOException; -import java.io.RandomAccessFile; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionManager; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -//import java.util.*; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.ManagerLogWriter; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender; import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; +import org.apache.logging.log4j.Logger; + +import java.io.*; + +//import com.gemstone.gemfire.distributed.DistributedSystem; +//import java.util.*; public final class TailLogResponse extends AdminResponse { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractBucketRegionQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractBucketRegionQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractBucketRegionQueue.java index 92eaa01..70fb12d 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractBucketRegionQueue.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractBucketRegionQueue.java @@ -16,24 +16,8 @@ */ package com.gemstone.gemfire.internal.cache; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.TimeoutException; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.lru.LRUStatistics; import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector; import com.gemstone.gemfire.internal.cache.versions.VersionSource; @@ -47,6 +31,12 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; import com.gemstone.gemfire.internal.offheap.annotations.Released; +import org.apache.logging.log4j.Logger; + +import java.util.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.ReentrantReadWriteLock; public abstract class AbstractBucketRegionQueue extends BucketRegion { protected static final Logger logger = LogService.getLogger(); @@ -55,8 +45,8 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion { * The maximum size of this single queue before we start blocking puts * The system property is in megabytes. */ - private final long maximumSize = 1024 * 1024 * Long.getLong("gemfire.GATEWAY_QUEUE_THROTTLE_SIZE_MB", -1); - private final long throttleTime = Long.getLong("gemfire.GATEWAY_QUEUE_THROTTLE_TIME_MS", 100); + private final long maximumSize = 1024 * 1024 * Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "GATEWAY_QUEUE_THROTTLE_SIZE_MB", -1); + private final long throttleTime = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "GATEWAY_QUEUE_THROTTLE_TIME_MS", 100); private final LRUStatistics stats; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java index d473f9b..c9648a3 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java @@ -16,13 +16,13 @@ */ package com.gemstone.gemfire.internal.cache; -import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; import com.gemstone.gemfire.cache.server.ServerLoadProbe; import com.gemstone.gemfire.distributed.DistributedMember; 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.internal.admin.ClientMembershipMessage; import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; @@ -42,7 +42,7 @@ import java.util.Set; */ public abstract class AbstractCacheServer implements CacheServer { - public static final String TEST_OVERRIDE_DEFAULT_PORT_PROPERTY = "gemfire.test.CacheServer.OVERRIDE_DEFAULT_PORT"; + public static final String TEST_OVERRIDE_DEFAULT_PORT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "test.CacheServer.OVERRIDE_DEFAULT_PORT"; /** The cache that is served by this bridge server */ protected final InternalCache cache; @@ -149,7 +149,7 @@ public abstract class AbstractCacheServer implements CacheServer { this.maximumMessageCount = CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT; this.messageTimeToLive = CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE; // TODO this should be configurable in CacheServer - this.transactionTimeToLive = Integer.getInteger("gemfire.cacheServer.transactionTimeToLive", 180); + this.transactionTimeToLive = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "cacheServer.transactionTimeToLive", 180); this.groups = CacheServer.DEFAULT_GROUPS; this.bindAddress = CacheServer.DEFAULT_BIND_ADDRESS; this.hostnameForClients = CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java index 2e510b3..95854ec 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java @@ -17,67 +17,13 @@ package com.gemstone.gemfire.internal.cache; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheCallback; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheStatistics; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskWriteAttributes; -import com.gemstone.gemfire.cache.EntryExistsException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.EvictionAttributesMutator; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.MirrorType; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAccessException; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionMembershipListener; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.RoleException; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.StatisticsDisabledException; -import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.cache.TimeoutException; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.query.FunctionDomainException; -import com.gemstone.gemfire.cache.query.NameResolutionException; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.TypeMismatchException; +import com.gemstone.gemfire.cache.query.*; import com.gemstone.gemfire.cache.query.internal.index.IndexManager; import com.gemstone.gemfire.cache.snapshot.RegionSnapshotService; import com.gemstone.gemfire.cache.wan.GatewaySender; @@ -85,6 +31,7 @@ import com.gemstone.gemfire.compression.Compressor; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DM; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.DataSerializableFixedID; import com.gemstone.gemfire.internal.cache.extension.Extensible; @@ -97,6 +44,15 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.util.ArrayUtils; import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration; +import org.apache.logging.log4j.Logger; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.atomic.AtomicLong; /** * Takes care of RegionAttributes, AttributesMutator, and some no-brainer method @@ -245,8 +201,8 @@ public abstract class AbstractRegion implements Region, RegionAttributes, private final AtomicLong lastModifiedTime; - private static final boolean trackHits = !Boolean.getBoolean("gemfire.ignoreHits"); - private static final boolean trackMisses = !Boolean.getBoolean("gemfire.ignoreMisses"); + private static final boolean trackHits = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ignoreHits"); + private static final boolean trackMisses = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ignoreMisses"); private final AtomicLong hitCount = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java index 8075367..35f16bc 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java @@ -17,22 +17,10 @@ package com.gemstone.gemfire.internal.cache; -import java.io.IOException; -import java.util.Arrays; - -import org.apache.logging.log4j.Logger; - -import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ABSTRACT_REGION_ENTRY_FILL_IN_VALUE; -import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ABSTRACT_REGION_ENTRY_PREPARE_VALUE_FOR_CACHE; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.InvalidDeltaException; import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.TimeoutException; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.IndexMaintenanceException; import com.gemstone.gemfire.cache.query.QueryException; import com.gemstone.gemfire.cache.query.internal.index.IndexManager; @@ -40,32 +28,20 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexProtocol; import com.gemstone.gemfire.cache.util.GatewayConflictHelper; import com.gemstone.gemfire.cache.util.GatewayConflictResolver; 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.Assert; -import com.gemstone.gemfire.internal.ByteArrayDataInput; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.Version; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.cache.lru.LRUClockNode; import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; import com.gemstone.gemfire.internal.cache.persistence.DiskStoreID; -import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationException; -import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; +import com.gemstone.gemfire.internal.cache.versions.*; import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.offheap.MemoryAllocator; -import com.gemstone.gemfire.internal.offheap.OffHeapHelper; -import com.gemstone.gemfire.internal.offheap.ReferenceCountHelper; -import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl; -import com.gemstone.gemfire.internal.offheap.StoredObject; +import com.gemstone.gemfire.internal.offheap.*; import com.gemstone.gemfire.internal.offheap.annotations.Released; import com.gemstone.gemfire.internal.offheap.annotations.Retained; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; @@ -79,6 +55,13 @@ import com.gemstone.gemfire.pdx.PdxSerializationException; import com.gemstone.gemfire.pdx.PdxSerializer; import com.gemstone.gemfire.pdx.internal.ConvertableToBytes; import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.util.Arrays; + +import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ABSTRACT_REGION_ENTRY_FILL_IN_VALUE; +import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ABSTRACT_REGION_ENTRY_PREPARE_VALUE_FOR_CACHE; /** * Abstract implementation class of RegionEntry interface. @@ -100,7 +83,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, * 'gemfire.disableAccessTimeUpdateOnPut' system property. */ protected static final boolean DISABLE_ACCESS_TIME_UPDATE_ON_PUT = Boolean - .getBoolean("gemfire.disableAccessTimeUpdateOnPut"); + .getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disableAccessTimeUpdateOnPut"); /* * Flags for a Region Entry. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java index 68f28d6..a512750 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java @@ -17,55 +17,29 @@ package com.gemstone.gemfire.internal.cache; - -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; - -import com.gemstone.gemfire.internal.cache.region.entry.RegionEntryFactoryBuilder; -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.GemFireIOException; import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.cache.CacheRuntimeException; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.EntryExistsException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.TransactionId; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.IndexMaintenanceException; import com.gemstone.gemfire.cache.query.QueryException; import com.gemstone.gemfire.cache.query.internal.IndexUpdater; import com.gemstone.gemfire.cache.query.internal.index.IndexManager; import com.gemstone.gemfire.cache.query.internal.index.IndexProtocol; import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.internal.cache.DiskInitFile.DiskRegionFlag; import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo; import com.gemstone.gemfire.internal.cache.delta.Delta; import com.gemstone.gemfire.internal.cache.ha.HAContainerWrapper; import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; import com.gemstone.gemfire.internal.cache.lru.LRUEntry; +import com.gemstone.gemfire.internal.cache.region.entry.RegionEntryFactoryBuilder; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper; -import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationException; -import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector; -import com.gemstone.gemfire.internal.cache.versions.VersionHolder; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; +import com.gemstone.gemfire.internal.cache.versions.*; import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl; import com.gemstone.gemfire.internal.concurrent.MapCallbackAdapter; import com.gemstone.gemfire.internal.concurrent.MapResult; @@ -81,6 +55,10 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; import com.gemstone.gemfire.internal.sequencelog.EntryLogger; import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap; +import org.apache.logging.log4j.Logger; + +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; /** * Abstract implementation of {@link RegionMap}that has all the common @@ -1841,7 +1819,7 @@ public abstract class AbstractRegionMap implements RegionMap { * on that client to be notified of the invalidate. * A non-empty "caching-proxy" will receive invalidates from the server. */ - public static boolean FORCE_INVALIDATE_EVENT = Boolean.getBoolean("gemfire.FORCE_INVALIDATE_EVENT"); + public static boolean FORCE_INVALIDATE_EVENT = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "FORCE_INVALIDATE_EVENT"); /** * If the FORCE_INVALIDATE_EVENT flag is true http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java index 0c53d4b..f8e04a6 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java @@ -16,30 +16,6 @@ */ package com.gemstone.gemfire.internal.cache; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.Serializable; -import java.util.AbstractSet; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Semaphore; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.cache.CacheClosedException; @@ -68,6 +44,17 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.util.StopWatch; +import org.apache.logging.log4j.Logger; + +import java.io.*; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; /** * Specialized {@link CacheDistributionAdvisor} for {@link BucketRegion @@ -921,7 +908,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { // failure detection period long timeout = config.getMemberTimeout() * 3; // plus time for a new member to become primary - timeout += Long.getLong("gemfire.BucketAdvisor.getPrimaryTimeout", + timeout += Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "BucketAdvisor.getPrimaryTimeout", 15 * 1000); InternalDistributedMember newPrimary = waitForPrimaryMember(timeout); return newPrimary; @@ -1612,7 +1599,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { } } - private final static long BUCKET_STORAGE_WAIT = Long.getLong("gemfire.BUCKET_STORAGE_WAIT", 15000).longValue(); // 15 seconds + private final static long BUCKET_STORAGE_WAIT = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "BUCKET_STORAGE_WAIT", 15000).longValue(); // 15 seconds public boolean waitForStorage() { synchronized (this) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java index 4d51eb8..c87cc3d 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java @@ -16,41 +16,8 @@ */ package com.gemstone.gemfire.internal.cache; -import java.io.DataOutput; -import java.io.IOException; -import java.io.InputStream; -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.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.CopyHelper; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.DeltaSerializationException; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.TimeoutException; +import com.gemstone.gemfire.*; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.partition.PartitionListener; import com.gemstone.gemfire.cache.query.internal.IndexUpdater; import com.gemstone.gemfire.distributed.DistributedMember; @@ -58,6 +25,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.AtomicLongWithTerminalState; import com.gemstone.gemfire.distributed.internal.DirectReplyProcessor; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionStats; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Assert; @@ -67,15 +35,7 @@ import com.gemstone.gemfire.internal.cache.BucketAdvisor.BucketProfile; import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo; import com.gemstone.gemfire.internal.cache.control.MemoryEvent; import com.gemstone.gemfire.internal.cache.delta.Delta; -import com.gemstone.gemfire.internal.cache.partitioned.Bucket; -import com.gemstone.gemfire.internal.cache.partitioned.DestroyMessage; -import com.gemstone.gemfire.internal.cache.partitioned.InvalidateMessage; -import com.gemstone.gemfire.internal.cache.partitioned.LockObject; -import com.gemstone.gemfire.internal.cache.partitioned.PRTombstoneMessage; -import com.gemstone.gemfire.internal.cache.partitioned.PartitionMessage; -import com.gemstone.gemfire.internal.cache.partitioned.PutAllPRMessage; -import com.gemstone.gemfire.internal.cache.partitioned.PutMessage; -import com.gemstone.gemfire.internal.cache.partitioned.RemoveAllPRMessage; +import com.gemstone.gemfire.internal.cache.partitioned.*; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientTombstoneMessage; @@ -84,6 +44,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.versions.VersionStamp; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl; +import com.gemstone.gemfire.internal.concurrent.AtomicLong5; import com.gemstone.gemfire.internal.concurrent.Atomics; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; @@ -92,7 +53,14 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.offheap.annotations.Released; import com.gemstone.gemfire.internal.offheap.annotations.Retained; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; -import com.gemstone.gemfire.internal.concurrent.AtomicLong5; +import org.apache.logging.log4j.Logger; + +import java.io.DataOutput; +import java.io.IOException; +import java.io.InputStream; +import java.util.*; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Lock; /** @@ -215,8 +183,8 @@ implements Bucket /* one map per bucket region */ public HashMap allKeysMap = new HashMap(); - static final boolean FORCE_LOCAL_LISTENERS_INVOCATION = - Boolean.getBoolean("gemfire.BucketRegion.alwaysFireLocalListeners"); + static final boolean FORCE_LOCAL_LISTENERS_INVOCATION = + Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "BucketRegion.alwaysFireLocalListeners"); // gemfire.BucktRegion.alwaysFireLocalListeners=true private volatile AtomicLong5 eventSeqNum = null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java index 63138b5..2c72410 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java @@ -16,49 +16,19 @@ */ package com.gemstone.gemfire.internal.cache; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.GemFireIOException; import com.gemstone.gemfire.InternalGemFireError; import com.gemstone.gemfire.InvalidValueException; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.ClientSession; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.DynamicRegionFactory; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.InterestRegistrationListener; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; import com.gemstone.gemfire.cache.server.ServerLoadProbe; import com.gemstone.gemfire.cache.server.internal.LoadMonitor; import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisee; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.ResourceEvent; -import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.OSProcess; @@ -74,6 +44,12 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.management.membership.ClientMembership; import com.gemstone.gemfire.management.membership.ClientMembershipListener; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; /** * An implementation of the <code>CacheServer</code> interface that delegates @@ -87,8 +63,9 @@ public class CacheServerImpl implements DistributionAdvisee { private static final Logger logger = LogService.getLogger(); - - private static final int FORCE_LOAD_UPDATE_FREQUENCY= Integer.getInteger("gemfire.BridgeServer.FORCE_LOAD_UPDATE_FREQUENCY", 10).intValue(); + + private static final int FORCE_LOAD_UPDATE_FREQUENCY = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "BridgeServer.FORCE_LOAD_UPDATE_FREQUENCY", 10) + .intValue(); /** The acceptor that does the actual serving */ private volatile AcceptorImpl acceptor; @@ -122,8 +99,8 @@ public class CacheServerImpl */ private int serialNumber; // changed on each start - public static final boolean ENABLE_NOTIFY_BY_SUBSCRIPTION_FALSE = - Boolean.getBoolean("gemfire.cache-server.enable-notify-by-subscription-false"); + public static final boolean ENABLE_NOTIFY_BY_SUBSCRIPTION_FALSE = + Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "cache-server.enable-notify-by-subscription-false"); // ////////////////////// Constructors ////////////////////// http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java index d13c79f..d3365e8 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java @@ -17,30 +17,13 @@ package com.gemstone.gemfire.internal.cache; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.PrintStream; -import java.io.Serializable; -import java.net.URL; -import java.util.AbstractList; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; @@ -55,6 +38,13 @@ import com.gemstone.gemfire.internal.process.StartupStatusListener; import com.gemstone.gemfire.internal.util.IOUtils; import com.gemstone.gemfire.internal.util.JavaCommandBuilder; +import java.io.*; +import java.net.URL; +import java.util.*; +import java.util.concurrent.TimeUnit; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS; + /** * Launcher program to start a cache server. * @@ -64,23 +54,23 @@ import com.gemstone.gemfire.internal.util.JavaCommandBuilder; public class CacheServerLauncher { /** Is this VM a dedicated Cache Server? This value is used mainly by the admin API. */ - public static boolean isDedicatedCacheServer = Boolean.getBoolean("gemfire.isDedicatedServer"); + public static boolean isDedicatedCacheServer = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "isDedicatedServer"); - public static boolean ASSIGN_BUCKETS = Boolean.getBoolean("gemfire.CacheServerLauncher.assignBucketsToPartitions"); + public static boolean ASSIGN_BUCKETS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "CacheServerLauncher.assignBucketsToPartitions"); //default is to exit if property not defined - public static boolean DONT_EXIT_AFTER_LAUNCH = Boolean.getBoolean("gemfire.CacheServerLauncher.dontExitAfterLaunch"); + public static boolean DONT_EXIT_AFTER_LAUNCH = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "CacheServerLauncher.dontExitAfterLaunch"); /** Should the launch command be printed? */ public static final boolean PRINT_LAUNCH_COMMAND = Boolean.getBoolean( CacheServerLauncher.class.getSimpleName() + ".PRINT_LAUNCH_COMMAND"); - - private static final long STATUS_WAIT_TIME - = Long.getLong("gemfire.CacheServerLauncher.STATUS_WAIT_TIME_MS", 15000); + + private static final long STATUS_WAIT_TIME + = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "CacheServerLauncher.STATUS_WAIT_TIME_MS", 15000); /** How long to wait for a cache server to stop */ - private static final long SHUTDOWN_WAIT_TIME - = Long.getLong("gemfire.CacheServerLauncher.SHUTDOWN_WAIT_TIME_MS", 20000); + private static final long SHUTDOWN_WAIT_TIME + = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "CacheServerLauncher.SHUTDOWN_WAIT_TIME_MS", 20000); protected final String baseName; protected final String defaultLogFileName; @@ -262,7 +252,7 @@ public class CacheServerLauncher { protected static final String CLASSPATH = "classpath"; protected static final String REBALANCE = "rebalance"; protected static final String SERVER_PORT = "server-port"; - protected static final String SERVER_BIND_ADDRESS = "server-bind-address"; + protected static final String SERVER_BIND_ADDRESS_NAME = SERVER_BIND_ADDRESS; protected static final String DISABLE_DEFAULT_SERVER = "disable-default-server"; public static final String CRITICAL_HEAP_PERCENTAGE = "critical-heap-percentage"; @@ -272,7 +262,7 @@ public class CacheServerLauncher { "critical-off-heap-percentage"; public static final String EVICTION_OFF_HEAP_PERCENTAGE = "eviction-off-heap-percentage"; - protected static final String LOCK_MEMORY = "lock-memory"; + protected static final String LOCK_MEMORY = SystemConfigurationProperties.LOCK_MEMORY; protected final File processDirOption(final Map<String, Object> options, final String dirValue) throws FileNotFoundException { final File inputWorkingDirectory = new File(dirValue); @@ -318,7 +308,7 @@ public class CacheServerLauncher { if (System.getProperty("os.name").indexOf("Windows") >= 0) { throw new IllegalArgumentException("Unable to lock memory on this operating system"); } - props.put(DistributionConfig.LOCK_MEMORY_NAME, "true"); + props.put(LOCK_MEMORY, "true"); } else if (arg.startsWith("-rebalance")) { options.put(REBALANCE, Boolean.TRUE); @@ -339,7 +329,7 @@ public class CacheServerLauncher { options.put(EVICTION_OFF_HEAP_PERCENTAGE, arg); } else if (arg.startsWith("-server-bind-address")) { - options.put(SERVER_BIND_ADDRESS, arg); + options.put(SERVER_BIND_ADDRESS_NAME, arg); } else if (arg.startsWith("-J")) { String vmArg = arg.substring(2); @@ -450,7 +440,7 @@ public class CacheServerLauncher { options.put(SERVER_PORT, arg.substring(arg.indexOf("=") + 1)); } else if (arg.startsWith("-server-bind-address")) { - options.put(SERVER_BIND_ADDRESS, arg.substring(arg.indexOf("=") + 1)); + options.put(SERVER_BIND_ADDRESS_NAME, arg.substring(arg.indexOf("=") + 1)); } else if (arg.startsWith("-" + CRITICAL_HEAP_PERCENTAGE)) { options.put(CRITICAL_HEAP_PERCENTAGE, arg.substring(arg.indexOf("=") + 1)); @@ -655,7 +645,7 @@ public class CacheServerLauncher { serverPort.set(Integer.parseInt(serverPortString)); } - serverBindAddress.set((String) options.get(SERVER_BIND_ADDRESS)); + serverBindAddress.set((String) options.get(SERVER_BIND_ADDRESS_NAME)); disableDefaultServer.set((Boolean) options.get(DISABLE_DEFAULT_SERVER)); workingDir = new File(System.getProperty("user.dir")); @@ -1244,7 +1234,7 @@ public class CacheServerLauncher { commandLineWrapper.add((String) options.get(DISABLE_DEFAULT_SERVER)); commandLineWrapper.add((String) options.get(SERVER_PORT)); - commandLineWrapper.add((String) options.get(SERVER_BIND_ADDRESS)); + commandLineWrapper.add((String) options.get(SERVER_BIND_ADDRESS_NAME)); String criticalHeapThreshold = (String)options.get(CRITICAL_HEAP_PERCENTAGE); if (criticalHeapThreshold != null) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java index b19d310..83b0a58 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java @@ -17,10 +17,9 @@ package com.gemstone.gemfire.internal.cache; -import java.io.IOException; - import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.cache.util.ObjectSizer; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.DSCODE; import com.gemstone.gemfire.internal.HeapDataOutputStream; import com.gemstone.gemfire.internal.NullDataOutputStream; @@ -28,14 +27,16 @@ import com.gemstone.gemfire.internal.cache.lru.Sizeable; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.pdx.PdxInstance; +import java.io.IOException; + /** * Produces instances that implement CachedDeserializable. * @since GemFire 5.0.2 * */ public class CachedDeserializableFactory { - public static boolean PREFER_DESERIALIZED = ! Boolean.getBoolean("gemfire.PREFER_SERIALIZED"); - public static boolean STORE_ALL_VALUE_FORMS = Boolean.getBoolean("gemfire.STORE_ALL_VALUE_FORMS"); + public static boolean PREFER_DESERIALIZED = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "PREFER_SERIALIZED"); + public static boolean STORE_ALL_VALUE_FORMS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "STORE_ALL_VALUE_FORMS"); /** * Currently GFE always wants a CachedDeserializable wrapper. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClusterConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClusterConfigurationLoader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClusterConfigurationLoader.java index b21f901..e362389 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClusterConfigurationLoader.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClusterConfigurationLoader.java @@ -16,21 +16,6 @@ */ package com.gemstone.gemfire.internal.cache; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.UnmodifiableException; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -47,6 +32,14 @@ import com.gemstone.gemfire.internal.process.ClusterConfigurationNotAvailableExc import com.gemstone.gemfire.management.internal.configuration.domain.Configuration; import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationRequest; import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationResponse; +import org.apache.logging.log4j.Logger; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; public class ClusterConfigurationLoader { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java index 7e97f4d..b53ed31 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java @@ -17,34 +17,24 @@ package com.gemstone.gemfire.internal.cache; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.cache.EntryDestroyedException; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionDestroyedException; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionService; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext; import com.gemstone.gemfire.internal.cache.partitioned.PRLocallyDestroyedException; import com.gemstone.gemfire.internal.cache.persistence.PRPersistentConfig; import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; +import org.apache.logging.log4j.Logger; + +import java.io.Serializable; +import java.util.*; +import java.util.Map.Entry; /** * An utility class to retrieve colocated regions in a colocation hierarchy in @@ -116,7 +106,7 @@ public class ColocationHelper { * if they are not attached to the region. See bug 50120. Mutable * for tests. */ - public static boolean IGNORE_UNRECOVERED_QUEUE = Boolean.getBoolean("gemfire.IGNORE_UNRECOVERED_QUEUE"); + public static boolean IGNORE_UNRECOVERED_QUEUE = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "IGNORE_UNRECOVERED_QUEUE"); /** * An utility method to retrieve colocated region of a given partitioned http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java index 3219bb4..f010ca9 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java @@ -16,68 +16,17 @@ */ package com.gemstone.gemfire.internal.cache; -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import it.unimi.dsi.fastutil.longs.LongOpenHashSet; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.PrintStream; -import java.net.InetAddress; -import java.nio.channels.ClosedByInterruptException; -import java.nio.channels.FileChannel; -import java.nio.channels.FileLock; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -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.Properties; -import java.util.Set; -import java.util.TreeSet; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.StatisticsFactory; import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.RegionDestroyedException; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.persistence.PersistentID; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.ByteArrayDataInput; +import com.gemstone.gemfire.i18n.StringId; import com.gemstone.gemfire.internal.FileUtil; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.cache.DiskEntry.Helper.ValueWrapper; @@ -85,18 +34,7 @@ import com.gemstone.gemfire.internal.cache.DiskEntry.RecoveredEntry; import com.gemstone.gemfire.internal.cache.ExportDiskRegion.ExportWriter; import com.gemstone.gemfire.internal.cache.lru.LRUAlgorithm; import com.gemstone.gemfire.internal.cache.lru.LRUStatistics; -import com.gemstone.gemfire.internal.cache.persistence.BackupInspector; -import com.gemstone.gemfire.internal.cache.persistence.BackupManager; -import com.gemstone.gemfire.internal.cache.persistence.BytesAndBits; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.cache.persistence.DiskRegionView; -import com.gemstone.gemfire.internal.cache.persistence.DiskStoreFilter; -import com.gemstone.gemfire.internal.cache.persistence.DiskStoreID; -import com.gemstone.gemfire.internal.cache.persistence.OplogType; -import com.gemstone.gemfire.internal.cache.persistence.PRPersistentConfig; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberID; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberPattern; -import com.gemstone.gemfire.internal.cache.persistence.RestoreScript; +import com.gemstone.gemfire.internal.cache.persistence.*; import com.gemstone.gemfire.internal.cache.snapshot.GFSnapshot; import com.gemstone.gemfire.internal.cache.snapshot.GFSnapshot.SnapshotWriter; import com.gemstone.gemfire.internal.cache.snapshot.SnapshotPacket.SnapshotRecord; @@ -109,13 +47,33 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; import com.gemstone.gemfire.internal.util.BlobHelper; import com.gemstone.gemfire.pdx.internal.EnumInfo; import com.gemstone.gemfire.pdx.internal.PdxField; import com.gemstone.gemfire.pdx.internal.PdxType; import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration; -import com.gemstone.gemfire.i18n.StringId; +import it.unimi.dsi.fastutil.ints.IntOpenHashSet; +import it.unimi.dsi.fastutil.longs.LongOpenHashSet; +import org.apache.logging.log4j.Logger; + +import java.io.*; +import java.net.InetAddress; +import java.nio.channels.ClosedByInterruptException; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; +import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; /** * Represents a (disk-based) persistent store for region data. Used for both @@ -132,7 +90,7 @@ public class DiskStoreImpl implements DiskStore { public static final boolean KRF_DEBUG = Boolean.getBoolean("disk.KRF_DEBUG"); public static final int MAX_OPEN_INACTIVE_OPLOGS = Integer.getInteger( - "gemfire.MAX_OPEN_INACTIVE_OPLOGS", 7).intValue(); + DistributionConfig.GEMFIRE_PREFIX + "MAX_OPEN_INACTIVE_OPLOGS", 7).intValue(); /* * If less than 20MB (default - configurable through this property) of the @@ -140,12 +98,13 @@ public class DiskStoreImpl implements DiskStore { * is better to bail out. */ public static final int MIN_DISK_SPACE_FOR_LOGS = Integer.getInteger( - "gemfire.MIN_DISK_SPACE_FOR_LOGS", 20).intValue(); + DistributionConfig.GEMFIRE_PREFIX + "MIN_DISK_SPACE_FOR_LOGS", 20).intValue(); /** Represents an invalid id of a key/value on disk */ public static final long INVALID_ID = 0L; // must be zero - - public static final String COMPLETE_COMPACTION_BEFORE_TERMINATION_PROPERTY_NAME = "gemfire.disk.completeCompactionBeforeTermination"; + + public static final String COMPLETE_COMPACTION_BEFORE_TERMINATION_PROPERTY_NAME = + DistributionConfig.GEMFIRE_PREFIX + "disk.completeCompactionBeforeTermination"; static final int MINIMUM_DIR_SIZE = 1024; @@ -165,16 +124,16 @@ public class DiskStoreImpl implements DiskStore { * Kept for backwards compat. Should use allowForceCompaction api/dtd instead. */ private final static boolean ENABLE_NOTIFY_TO_ROLL = Boolean - .getBoolean("gemfire.ENABLE_NOTIFY_TO_ROLL"); + .getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ENABLE_NOTIFY_TO_ROLL"); - public static final String RECOVER_VALUE_PROPERTY_NAME = "gemfire.disk.recoverValues"; - public static final String RECOVER_VALUES_SYNC_PROPERTY_NAME = "gemfire.disk.recoverValuesSync"; + public static final String RECOVER_VALUE_PROPERTY_NAME = DistributionConfig.GEMFIRE_PREFIX + "disk.recoverValues"; + public static final String RECOVER_VALUES_SYNC_PROPERTY_NAME = DistributionConfig.GEMFIRE_PREFIX + "disk.recoverValuesSync"; boolean RECOVER_VALUES = getBoolean( DiskStoreImpl.RECOVER_VALUE_PROPERTY_NAME, true); boolean RECOVER_VALUES_SYNC = getBoolean( DiskStoreImpl.RECOVER_VALUES_SYNC_PROPERTY_NAME, false); boolean FORCE_KRF_RECOVERY = getBoolean( - "gemfire.disk.FORCE_KRF_RECOVERY", false); + DistributionConfig.GEMFIRE_PREFIX + "disk.FORCE_KRF_RECOVERY", false); public static boolean getBoolean(String sysProp, boolean def) { return Boolean.valueOf(System.getProperty(sysProp, Boolean.valueOf(def) @@ -198,15 +157,15 @@ public class DiskStoreImpl implements DiskStore { * set it. */ private final int MAX_OPLOGS_PER_COMPACTION = Integer.getInteger( - "gemfire.MAX_OPLOGS_PER_COMPACTION", - Integer.getInteger("gemfire.MAX_OPLOGS_PER_ROLL", 1).intValue()) + DistributionConfig.GEMFIRE_PREFIX + "MAX_OPLOGS_PER_COMPACTION", + Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_OPLOGS_PER_ROLL", 1).intValue()) .intValue(); /** * */ public static final int MAX_CONCURRENT_COMPACTIONS = Integer.getInteger( - "gemfire.MAX_CONCURRENT_COMPACTIONS", - Integer.getInteger("gemfire.MAX_CONCURRENT_ROLLS", 1).intValue()) + DistributionConfig.GEMFIRE_PREFIX + "MAX_CONCURRENT_COMPACTIONS", + Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_CONCURRENT_ROLLS", 1).intValue()) .intValue(); /** @@ -214,20 +173,20 @@ public class DiskStoreImpl implements DiskStore { * tasks that can be pending before submitting the tasks start blocking. * These tasks are things like unpreblow oplogs, delete oplogs, etc. */ - public static final int MAX_PENDING_TASKS = Integer.getInteger("gemfire.disk.MAX_PENDING_TASKS", 6); + public static final int MAX_PENDING_TASKS = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "disk.MAX_PENDING_TASKS", 6); /** * This system property indicates that IF should also be preallocated. This property * will be used in conjunction with the PREALLOCATE_OPLOGS property. If PREALLOCATE_OPLOGS * is ON the below will by default be ON but in order to switch it off you need to explicitly */ static final boolean PREALLOCATE_IF = !System.getProperty( - "gemfire.preAllocateIF", "true").equalsIgnoreCase("false"); + DistributionConfig.GEMFIRE_PREFIX + "preAllocateIF", "true").equalsIgnoreCase("false"); /** * This system property indicates that Oplogs should be preallocated till the * maxOplogSize as specified for the disk store. */ static final boolean PREALLOCATE_OPLOGS = !System.getProperty( - "gemfire.preAllocateDisk", "true").equalsIgnoreCase("false"); + DistributionConfig.GEMFIRE_PREFIX + "preAllocateDisk", "true").equalsIgnoreCase("false"); /** * For some testing purposes we would not consider top property if this flag @@ -239,7 +198,7 @@ public class DiskStoreImpl implements DiskStore { * This system property turns on synchronous writes just the the init file. */ static final boolean SYNC_IF_WRITES = Boolean - .getBoolean("gemfire.syncMetaDataWrites"); + .getBoolean(DistributionConfig.GEMFIRE_PREFIX + "syncMetaDataWrites"); /** * For testing - to keep track of files for which fallocate happened @@ -372,9 +331,9 @@ public class DiskStoreImpl implements DiskStore { private static int calcCompactionThreshold(int ct) { if (ct == DiskStoreFactory.DEFAULT_COMPACTION_THRESHOLD) { // allow the old sys prop for backwards compat. - if (System.getProperty("gemfire.OVERFLOW_ROLL_PERCENTAGE") != null) { + if (System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "OVERFLOW_ROLL_PERCENTAGE") != null) { ct = (int) (Double.parseDouble(System.getProperty( - "gemfire.OVERFLOW_ROLL_PERCENTAGE", "0.50")) * 100.0); + DistributionConfig.GEMFIRE_PREFIX + "OVERFLOW_ROLL_PERCENTAGE", "0.50")) * 100.0); } } return ct; @@ -4397,9 +4356,9 @@ public class DiskStoreImpl implements DiskStore { } // need a cache so create a loner ds Properties props = new Properties(); - props.setProperty("locators", ""); - props.setProperty("mcast-port", "0"); - props.setProperty("cache-xml-file", ""); + props.setProperty(LOCATORS, ""); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, ""); DistributedSystem ds = DistributedSystem.connect(props); offlineDS = ds; Cache c = com.gemstone.gemfire.cache.CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreMonitor.java index 1d6e26c..b81142b 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreMonitor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreMonitor.java @@ -16,19 +16,6 @@ */ package com.gemstone.gemfire.internal.cache; -import java.io.File; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.cache.DiskAccessException; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; @@ -37,15 +24,23 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.*; public class DiskStoreMonitor { private static final Logger logger = LogService.getLogger(); - - private static final boolean DISABLE_MONITOR = Boolean.getBoolean("gemfire.DISK_USAGE_DISABLE_MONITORING"); + + private static final boolean DISABLE_MONITOR = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "DISK_USAGE_DISABLE_MONITORING"); // private static final boolean AUTO_RECONNECT = Boolean.getBoolean("gemfire.DISK_USAGE_ENABLE_AUTO_RECONNECT"); - - private static final int USAGE_CHECK_INTERVAL = Integer.getInteger("gemfire.DISK_USAGE_POLLING_INTERVAL_MILLIS", 10000); - private static final float LOG_WARNING_THRESHOLD_PCT = Integer.getInteger("gemfire.DISK_USAGE_LOG_WARNING_PERCENT", 99); + + private static final int USAGE_CHECK_INTERVAL = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "DISK_USAGE_POLLING_INTERVAL_MILLIS", 10000); + private static final float LOG_WARNING_THRESHOLD_PCT = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "DISK_USAGE_LOG_WARNING_PERCENT", 99); enum DiskState { NORMAL, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java index 3ff0333..9bb148b 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java @@ -16,12 +16,8 @@ */ package com.gemstone.gemfire.internal.cache; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.DiskWriteAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.*; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; @@ -66,7 +62,8 @@ public final class DiskWriteAttributesImpl implements DiskWriteAttributes private final long maxOplogSize; /** default max in bytes **/ - private static final long DEFAULT_MAX_OPLOG_SIZE = Long.getLong("gemfire.DEFAULT_MAX_OPLOG_SIZE", 1024L).longValue() * (1024 * 1024); // 1 GB + private static final long DEFAULT_MAX_OPLOG_SIZE = + Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "DEFAULT_MAX_OPLOG_SIZE", 1024L).longValue() * (1024 * 1024); // 1 GB /** default max limit in bytes **/ private static final long DEFAULT_MAX_OPLOG_SIZE_LIMIT = (long)Integer.MAX_VALUE * (1024*1024); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java index 937216f..eed5268 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java @@ -17,51 +17,11 @@ package com.gemstone.gemfire.internal.cache; -import java.io.IOException; -import java.io.InputStream; -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.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.InternalGemFireError; import com.gemstone.gemfire.InvalidDeltaException; import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionAccessException; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionDistributionException; -import com.gemstone.gemfire.cache.RegionMembershipListener; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.RoleException; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.TransactionId; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionException; @@ -74,37 +34,22 @@ import com.gemstone.gemfire.distributed.DistributedLockService; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.LockServiceDestroyedException; import com.gemstone.gemfire.distributed.Role; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisee; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.ProfileVisitor; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.MembershipListener; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; import com.gemstone.gemfire.distributed.internal.locks.DLockRemoteToken; import com.gemstone.gemfire.distributed.internal.locks.DLockService; 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.cache.CacheDistributionAdvisor.CacheProfile; import com.gemstone.gemfire.internal.cache.InitialImageOperation.GIIStatus; import com.gemstone.gemfire.internal.cache.RemoteFetchVersionMessage.FetchVersionResponse; import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType; import com.gemstone.gemfire.internal.cache.control.MemoryEvent; -import com.gemstone.gemfire.internal.cache.execute.DistributedRegionFunctionExecutor; -import com.gemstone.gemfire.internal.cache.execute.DistributedRegionFunctionResultSender; -import com.gemstone.gemfire.internal.cache.execute.DistributedRegionFunctionResultWaiter; -import com.gemstone.gemfire.internal.cache.execute.FunctionStats; -import com.gemstone.gemfire.internal.cache.execute.LocalResultCollector; -import com.gemstone.gemfire.internal.cache.execute.RegionFunctionContextImpl; -import com.gemstone.gemfire.internal.cache.execute.ServerToClientFunctionResultSender; +import com.gemstone.gemfire.internal.cache.execute.*; import com.gemstone.gemfire.internal.cache.lru.LRUEntry; -import com.gemstone.gemfire.internal.cache.persistence.CreatePersistentRegionProcessor; -import com.gemstone.gemfire.internal.cache.persistence.PersistenceAdvisor; -import com.gemstone.gemfire.internal.cache.persistence.PersistenceAdvisorImpl; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberID; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberManager; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberView; +import com.gemstone.gemfire.internal.cache.persistence.*; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.tier.sockets.VersionedObjectList; import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationException; @@ -113,7 +58,6 @@ import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueConfigurationException; import com.gemstone.gemfire.internal.cache.wan.GatewaySenderConfigurationException; -import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; @@ -121,7 +65,17 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released; import com.gemstone.gemfire.internal.offheap.annotations.Retained; import com.gemstone.gemfire.internal.sequencelog.RegionLogger; import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch; -import com.gemstone.gemfire.i18n.StringId; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.io.InputStream; +import java.util.*; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; /** * */ @@ -2683,7 +2637,7 @@ public class DistributedRegion extends LocalRegion implements //Fix for #48066 - make sure that region operations are completely //distributed to peers before destroying the region. long timeout = 1000L * getCache().getDistributedSystem().getConfig().getAckWaitThreshold(); - Boolean flushOnClose = !Boolean.getBoolean("gemfire.no-flush-on-close"); // test hook + Boolean flushOnClose = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "no-flush-on-close"); // test hook if (!this.cache.forcedDisconnect() && flushOnClose && this.getDistributionManager().getMembershipManager() != null && this.getDistributionManager().getMembershipManager().isConnected()) { @@ -3247,7 +3201,7 @@ public class DistributedRegion extends LocalRegion implements } static class DiskPage extends DiskPosition { - static final long DISK_PAGE_SIZE = Long.getLong("gemfire.DISK_PAGE_SIZE", 8 * 1024L).longValue(); + static final long DISK_PAGE_SIZE = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "DISK_PAGE_SIZE", 8 * 1024L).longValue(); DiskPage(DiskPosition dp) { this.setPosition(dp.oplogId, dp.offset / DISK_PAGE_SIZE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java index 16b4016..65b2c04 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java @@ -17,28 +17,8 @@ package com.gemstone.gemfire.internal.cache; -import java.io.ByteArrayInputStream; -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.DataOutput; -import java.io.IOException; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.CopyHelper; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.DeltaSerializationException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.SerializationException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.EntryOperation; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.SerializedCacheValue; -import com.gemstone.gemfire.cache.TransactionId; +import com.gemstone.gemfire.*; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.query.IndexMaintenanceException; import com.gemstone.gemfire.cache.query.QueryException; import com.gemstone.gemfire.cache.query.internal.IndexUpdater; @@ -48,16 +28,10 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexUtils; import com.gemstone.gemfire.cache.util.TimestampedEntryEvent; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionMessage; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.ByteArrayDataInput; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Sendable; -import com.gemstone.gemfire.internal.Version; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.cache.FilterRoutingInfo.FilterInfo; import com.gemstone.gemfire.internal.cache.delta.Delta; import com.gemstone.gemfire.internal.cache.lru.Sizeable; @@ -73,21 +47,19 @@ import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.offheap.OffHeapHelper; -import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; -import com.gemstone.gemfire.internal.offheap.ReferenceCountHelper; -import com.gemstone.gemfire.internal.offheap.Releasable; -import com.gemstone.gemfire.internal.offheap.StoredObject; +import com.gemstone.gemfire.internal.offheap.*; import com.gemstone.gemfire.internal.offheap.annotations.Released; import com.gemstone.gemfire.internal.offheap.annotations.Retained; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; - -import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE; -import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE; - import com.gemstone.gemfire.internal.util.ArrayUtils; import com.gemstone.gemfire.internal.util.BlobHelper; import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration; +import org.apache.logging.log4j.Logger; + +import java.io.*; + +import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE; +import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_OLD_VALUE; /** * Implementation of an entry event @@ -1632,7 +1604,7 @@ public class EntryEventImpl * If true (the default) then preserve old values in events. * If false then mark non-null values as being NOT_AVAILABLE. */ - private static final boolean EVENT_OLD_VALUE = !Boolean.getBoolean("gemfire.disable-event-old-value"); + private static final boolean EVENT_OLD_VALUE = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disable-event-old-value"); void putExistingEntry(final LocalRegion owner, RegionEntry entry) throws RegionClearedException {
