You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/06/15 16:17:34 UTC
[01/33] incubator-geode git commit: GEODE-837: add JUnit4 category
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-420 b5ed09350 -> 57901ec66
GEODE-837: add JUnit4 category
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4bb9baee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4bb9baee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4bb9baee
Branch: refs/heads/feature/GEODE-420
Commit: 4bb9baee62ede965514e4b9ced339a717ae2cd25
Parents: b5ed093
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu Jun 9 14:37:08 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jun 9 14:38:22 2016 -0700
----------------------------------------------------------------------
.../cache30/CacheRegionsReliablityStatsCheckDUnitTest.java | 3 +++
...PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java | 5 ++++-
.../gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java | 3 +++
.../gemfire/internal/cache/ha/HARegionQueueDUnitTest.java | 2 ++
4 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4bb9baee/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index 6b3d8b1..b3aad49 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -22,6 +22,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.util.Properties;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
@@ -39,7 +40,9 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+@Category(DistributedTest.class)
public class CacheRegionsReliablityStatsCheckDUnitTest extends JUnit4CacheTestCase {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4bb9baee/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index b011e0e..beebc14 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -63,7 +63,10 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.ThreadUtils;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
- public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest extends PRClientServerTestBase {
+
+@Category(DistributedTest.class)
+public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest extends PRClientServerTestBase {
+
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
private static final String TEST_FUNCTION2 = TestFunction.TEST_FUNCTION2;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4bb9baee/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 283a15f..10ca7ed 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -30,6 +30,7 @@ import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.AttributesFactory;
@@ -56,6 +57,7 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* This DUnit contains various tests to ensure new implementation of ha region
@@ -63,6 +65,7 @@ import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
*
* @since GemFire 5.7
*/
+@Category(DistributedTest.class)
public class HARQueueNewImplDUnitTest extends JUnit4DistributedTestCase {
private static final String regionName = HARQueueNewImplDUnitTest.class.getSimpleName();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4bb9baee/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
index 61c9b45..5566f01 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -51,8 +51,10 @@ import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+@Category(DistributedTest.class)
public class HARegionQueueDUnitTest extends JUnit4DistributedTestCase {
private static volatile boolean toCnt = true;
[24/33] incubator-geode git commit: GEODE-1470: Upgrade log4j to 2.6.1
Posted by ud...@apache.org.
GEODE-1470: Upgrade log4j to 2.6.1
* This closes #154 [klund@apache.org]
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0f2bb8fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0f2bb8fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0f2bb8fa
Branch: refs/heads/feature/GEODE-420
Commit: 0f2bb8fa713d391b59cb5e3f8e8641194bb915e9
Parents: cdfb940
Author: Kevin J. Duling <kd...@pivotal.io>
Authored: Thu Jun 9 09:56:10 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Jun 14 17:23:15 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/LogWriterAppender.java | 12 +++++++-----
.../sanctionedDataSerializables.txt | 20 ++++++++++----------
gradle/dependency-versions.properties | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f2bb8fa/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppender.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppender.java
index 9c103ee..401ef0c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppender.java
@@ -22,6 +22,11 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import com.gemstone.gemfire.internal.logging.LogConfig;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.ManagerLogWriter;
+import com.gemstone.gemfire.internal.logging.PureLogWriter;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LoggerContext;
@@ -29,11 +34,6 @@ import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.layout.PatternLayout;
-import com.gemstone.gemfire.internal.logging.LogConfig;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.ManagerLogWriter;
-import com.gemstone.gemfire.internal.logging.PureLogWriter;
-
/**
* A Log4j Appender which will copy all output to a LogWriter.
*
@@ -123,6 +123,8 @@ public class LogWriterAppender extends AbstractAppender implements PropertyChang
for (AppenderContext context : this.appenderContexts) {
context.getLoggerContext().removePropertyChangeListener(this);
context.getLoggerConfig().removeAppender(appenderName);
+ }
+ for (AppenderContext context : this.appenderContexts) { // do this second as log4j 2.6+ will re-add
context.getLoggerContext().updateLoggers();
}
stop();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f2bb8fa/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index fdad3a8..b64293d 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -959,8 +959,8 @@ fromData,14,2a2bb7000e2a2bb8000fb50006b1
toData,14,2a2bb700102ab400062bb80011b1
com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$EntryVersionsList,2
-fromData,284,2bb9002301003d1c077e07a0000704a70004033e1c10207e1020a0000704a70004033604b80012b20013b900140200990018b80012122404bd001659031cb8001753b9002503001d9900d32bb80026883605b80012b20013b90014020099001cb80012b20013122704bd001659031505b8002853b900180400bb0029591505b700023a0603360715071505a200902bb90023010036081508aa0000000000007d0000000000000003000000200000002900000037000000562a01b6000757a700572a15042bb8002ab6000757a7004915042bb8002a3a0919061909b6001db9002b0200572a1909b6000757a7002a15042bb8002a3a092bb8002688360a19091906150ab9002c0200c0002db600222a1909b6000757840701a7ff6fb1
-toData,299,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b90014020099001fb80012b20013121505bd001659032a5359041cb8001753b9001804002b1cb9001902001d9900b32ab60008852bb8001abb001b592ab60008b7001c3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900190200a7006c1907b6001d3a081908c700132b04b90019020019072bb8001ea7005019041908b6001f360915099a00242b05b90019020084050115053609190419081509b600205719072bb8001ea700212b06b90019020019072b03b6002119071908b6002215090464852bb8001aa7ff72b1
+fromData,268,2bb9002201003d1c077e07a0000704a70004033e1c10207e1020a0000704a70004033604b80012b20013b900140200990011b8001212231cb80016b9002403001d9900ca2bb80025883605b80012b20013b900140200990015b80012b2001312261505b80027b900280400bb0029591505b700023a0603360715071505a2008e2bb90022010036081508aa000000007b00000000000000030000001e0000002700000035000000542a01b6000757a700572a15042bb8002ab6000757a7004915042bb8002a3a0919061909b6001cb9002b0200572a1909b6000757a7002a15042bb8002a3a092bb8002588360a19091906150ab9002c0200c0002db600212a1909b6000757840701a7ff71b1
+toData,289,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b900140200990015b80012b2001312152a1cb80016b9001705002b1cb9001802001d9900b32ab60008852bb80019bb001a592ab60008b7001b3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900180200a7006c1907b6001c3a081908c700132b04b90018020019072bb8001da7005019041908b6001e360915099a00242b05b90018020084050115053609190419081509b6001f5719072bb8001da700212b06b90018020019072b03b6002019071908b6002115090464852bb80019a7ff72b1
com/gemstone/gemfire/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
toData,229,2ab4000a4d2ab4000c4e2c2bb8003d2dc1003e9a00072dc700182b03b9003f02002dc0003ec0003e2bb80040a700312dc1004199001e2dc000413a042b04b9003f02001904b9004201002bb80040a7000f2b04b9003f02002d2bb800432b2ab40012b40044b9003f02002ab4000636042ab40026c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004599000b150410208091360415041080809136042b1504b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
@@ -1048,8 +1048,8 @@ fromData,46,2a2bb7000a2a2bb9000b0100b500042bb9000b01009900182a2bb9000b0100b50007
toData,66,2a2bb700032b2ab40004b9000502002ab40006c6000704a70004033d2b1cb9000502001c99001d2b2ab40007b9000502002ab4000601b600082ab400062bb80009b1
com/gemstone/gemfire/internal/cache/FindVersionTagOperation$FindVersionTagMessage,2
-fromData,55,2a2bb700242a2bb900250100b500032a2bb900260100b500042abb002759b70028b500052ab400052bb800292a2bb9002a0100b50006b1
-toData,44,2a2bb7001f2b2ab40003b9002002002b2ab40004b9002102002ab400052bb800222b2ab40006b900230200b1
+fromData,55,2a2bb700232a2bb900240100b500032a2bb900250100b500042abb002659b70027b500052ab400052bb800282a2bb900290100b50006b1
+toData,44,2a2bb7001e2b2ab40003b9001f02002b2ab40004b9002002002ab400052bb800212b2ab40006b900220200b1
com/gemstone/gemfire/internal/cache/FindVersionTagOperation$VersionTagReply,2
fromData,17,2a2bb7000c2a2bb8000dc0000eb50002b1
@@ -1088,8 +1088,8 @@ fromData,224,2a2bb7001d2bb8001e4d014e2cc600102cb6001f9e00092c03b600204e2dc100219
toData,234,2a2bb700302ab40010c1002199001dbb00315904b700324d2c2ab40010b60033572c2bb80034a7000e2ab40010c000312bb800342b2ab40011b9003502002b2ab40012b9003502002b2ab40013b9003502002b2ab40014b9003602002b2ab40015b9003502002b2ab40003b9003602002b2ab40016b9003602002ab4001699000b2ab400022bb800372b2ab40001c7000702a7000c2ab40001b900380100b9003902002ab40001c600422ab40001b9003a0100b9003b01004d2cb9003c010099002a2cb9003d0100c0003e4e2db9003f01002bb800402db900410100c00042b600432bb80044a7ffd3b1
com/gemstone/gemfire/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2
-fromData,426,b80022b20023b9002402003d2bb9003701003e1d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b500021d10207e1020a0000704a700040336061c99001bb80022b20023123804bd002659031db8002753b90028040015049900432bb800398836071c99001cb80022b20023123a04bd002659031507b8003253b90028040003360815081507a200152a2bb8003bc00014b7001257840801a7ffea15059900ea2bb800398836071c99001cb80022b20023123c04bd002659031507b8003253b9002804002abb0003591507b70005b50004bb0003591507b700053a0803360915091507a200a12bb900370100360a150aaa0000008e00000000000000030000001d0000002b0000003e000000622ab4000401b90011020057a700662ab4000415062bb8003db90011020057a7005315062bb8003d3a0b1908190bb6002eb900110200572ab40004190bb90011020057a7002f15062bb8003d3a0b2bb8003988360c190b1908150cb900160200c0003eb600352ab40004190bb90011020057840901a7ff5ea7000e2abb000359b70001b50004b1
-toData,406,033d033e0336042ab700209a00091c05803d043e2ab40004b9000d01009e00431c07803d0436042ab40004b9001a01003a051905b9001b01009900271905b9001c0100c000173a061906c600131906c1002199000e1c1020803da70006a7ffd52ab400029900081c1008803db80022b20023b90024020099001fb80022b20023122505bd002659032a5359041cb8002753b9002804002b1cb9002902001d9900282ab7000e852bb8002a03360515052ab7000ea200132a1505b700132bb8002b840501a7ffea15049900cd2ab40004b9000d0100852bb8002abb002c592ab40004b9000d0100b7002d3a050336062ab40004b9001a01003a071907b9001b01009900951907b9001c0100c000173a081908c7000d2b03b900290200a700771908b6002e3a091909c700132b04b90029020019082bb8002fa7005b19051909b900300200c000313a0a190ac700292b05b9002902001506840601b800323a0a19051909190ab9003303005719082bb8002fa700222b06b90029020019082b03b6003419081909b60035190ab60036852bb8002aa7ff67b1
+fromData,406,b80022b20023b9002402003d2bb9003601003e1d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b500021d10207e1020a0000704a700040336061c990014b80022b2002312371db80026b900380400150499003c2bb800398836071c990015b80022b20023123a1507b80031b90038040003360815081507a200152a2bb8003bc00014b7001257840801a7ffea15059900e42bb800398836071c990015b80022b20023123c1507b80031b9003804002abb0003591507b70005b50004bb0003591507b700053a0803360915091507a200a22bb900360100360a150aaa000000008f00000000000000030000001e0000002c0000003f000000632ab4000401b90011020057a700662ab4000415062bb8003db90011020057a7005315062bb8003d3a0b1908190bb6002db900110200572ab40004190bb90011020057a7002f15062bb8003d3a0b2bb8003988360c190b1908150cb900160200c0003eb600342ab40004190bb90011020057840901a7ff5da7000e2abb000359b70001b50004b1
+toData,396,033d033e0336042ab700209a00091c05803d043e2ab40004b9000d01009e00431c07803d0436042ab40004b9001a01003a051905b9001b01009900271905b9001c0100c000173a061906c600131906c1002199000e1c1020803da70006a7ffd52ab400029900081c1008803db80022b20023b900240200990015b80022b2002312252a1cb80026b9002705002b1cb9002802001d9900282ab7000e852bb8002903360515052ab7000ea200132a1505b700132bb8002a840501a7ffea15049900cd2ab40004b9000d0100852bb80029bb002b592ab40004b9000d0100b7002c3a050336062ab40004b9001a01003a071907b9001b01009900951907b9001c0100c000173a081908c7000d2b03b900280200a700771908b6002d3a091909c700132b04b90028020019082bb8002ea7005b19051909b9002f0200c000303a0a190ac700292b05b9002802001506840601b800313a0a19051909190ab9003203005719082bb8002ea700222b06b90028020019082b03b6003319081909b60034190ab60035852bb80029a7ff67b1
com/gemstone/gemfire/internal/cache/InitialImageOperation$RVVReplyMessage,2
fromData,33,2a2bb700162bb9001701003d1c9900132bb9001701003e2a1d2bb80018b50004b1
@@ -1941,10 +1941,10 @@ fromData,145,2bb9001401003d1c99000e2abb001559b70016b5000a2a1cb500032bb9001701003
toData,209,2b2ab40003b9000402002ab40005c600bb2ab40006b9000701003d2b1cb900080200033e1d1ca200a02ab400061db9000902003a042ab400051d3336052ab400039900112ab4000a1db9000902002bb8000b150506a0000d2b06b9000d0200a70029150505a0000d2b05b9000d0200a7001915059a000d2b03b9000d0200a7000a2b04b9000d0200150505a000181904b8000e2bb8000f1904b600102bb80011a700201904c100129900121904c00012c000122bb8000fa7000919042bb80013840301a7ff61a7000a2b03b900080200b1
com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList,4
-fromData,570,b20002b20003b9000402003d2bb9005e01003e2a1d047e04a0000704a7000403b500291d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b5000f2a1d10107e1010a0000704a7000403b5001e1d10207e1020a0000704a700040336061c99001bb20002b20003125f04bd000659031db8004d53b9000704002ab400299900522bb800608836072abb001b591507b70021b5000d1c99001cb20002b20003126104bd000659031507b8004e53b90007040003360815081507a200172ab4000d2bb80062b9000e020057840801a7ffe815049900562bb800608836071c99001cb20002b20003126304bd000659031507b8004e53b9000704002abb001b591507b70021b500082a1507bc08b5003003360815081507a200102a15082bb70064840801a7ffefa7000e2abb001b59b7001cb5000815059900e42bb800608836071c99001cb20002b20003126504bd000659031507b8004e53b9000704002abb001b591507b70021b50010bb001b591507b700213a0803360915091507a2009b2bb9005e0100360a150aaa00000000008800000000000000030000001f0000002b0000003c0000005e2ab4001001b6001157a700602ab4001015062bb80066b6001157a7004f15062bb800663a0b1908190bb60057b9000e02
00572ab40010190bb6001157a7002d15062bb800663a0b2bb8006088360c190b1908150cb900510200c00067b6005c2ab40010190bb6001157840901a7ff64a7000e2abb001b59b7001cb50010b1
+fromData,542,b20002b20003b9000402003d2bb9005e01003e2a1d047e04a0000704a7000403b500291d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b5000e2a1d10107e1010a0000704a7000403b5001e1d10207e1020a0000704a700040336061c990014b20002b20003125f1db8004db9006004002ab4002999004b2bb800618836072abb001b591507b70021b5000c1c990015b20002b2000312621507b8004eb90060040003360815081507a200172ab4000c2bb80063b9000d020057840801a7ffe8150499004f2bb800618836071c990015b20002b2000312641507b8004eb9006004002abb001b591507b70021b500072a1507bc08b5003003360815081507a200102a15082bb70065840801a7ffefa7000e2abb001b59b7001cb5000715059900dd2bb800618836071c990015b20002b2000312661507b8004eb9006004002abb001b591507b70021b5000fbb001b591507b700213a0803360915091507a2009b2bb9005e0100360a150aaa00000000008800000000000000030000001f0000002b0000003c0000005e2ab4000f01b6001057a700602ab4000f15062bb80067b6001057a7004f15062bb800673a0b1908190bb60057b9000d0200572ab4000f190bb6001057a7002d15062bb800673a0b2bb8006188
360c190b1908150cb900510200c00068b6005c2ab4000f190bb6001057840901a7ff64a7000e2abb001b59b7001cb5000fb1
fromDataPre_GFE_8_0_0_0,6,2a2bb60045b1
toDataPre_GFE_8_0_0_0,10,2ab700012a2bb60044b1
-toData,639,03360603360703360815049900102ab4002999000915060480360615059900182ab40008b9004a01009a000c1506058036060436072ab40010b600159e00451506078036060436082ab40010b600223a091909b9002301009900291909b900240100c000253a0a190ac60015190ac1004b99001015061020803606a70006a7ffd32ab4000f99000a150610088036062ab4001e99000a15061010803606b20002b20003b90004020099002eb20002b20003124c07bd000659032a5359041506b8004d5359051cb8004e5359061db8004e53b9000704002b1506b9004f0200150499005a2ab400299900531d360915091c602ab4000db900090100a40014032ab4000db9000901001c64b8003136091509852bb800501c360a03360b150b1509a2001b2ab4000d150ab9005102002bb80052840b01840a01a7ffe41505990061150799005c1d360915091c602ab40008b900090100a40014032ab40008b9000901001c64b8003136091509852bb8005003360a1c360b03360c150c1509a200212a2ab40008150bb900510200150a840a012bb70053840c01840b01a7ffde15089900df1d360915091c602ab40010b60015a40012032ab40010b600151c64b8003136091509852bb80050bb0054591509b700553a0a03360b1c360c03360d150d1509a2009d2ab40010150cb60056
c000253a0e190ec7000d2b03b9004f0200a70077190eb600573a0f190fc700132b04b9004f0200190e2bb80058a7005b190a190fb900590200c0005a3a101910c700292b05b9004f0200150b840b01b8004e3a10190a190f1910b9003c030057190e2bb80058a700222b06b9004f0200190e2b03b6005b190e190fb6005c1910b6005d852bb80050840d01840c01a7ff62b1
+toData,623,03360603360703360815049900102ab4002999000915060480360615059900182ab40007b9004a01009a000c1506058036060436072ab4000fb600159e00451506078036060436082ab4000fb600223a091909b9002301009900291909b900240100c000253a0a190ac60015190ac1004b99001015061020803606a70006a7ffd32ab4000e99000a150610088036062ab4001e99000a15061010803606b20002b20003b90004020099001eb20002b20003124c2a1506b8004d1cb8004e1db8004eb9001307002b1506b9004f0200150499005a2ab400299900531d360915091c602ab4000cb900080100a40014032ab4000cb9000801001c64b8003136091509852bb800501c360a03360b150b1509a2001b2ab4000c150ab9005102002bb80052840b01840a01a7ffe41505990061150799005c1d360915091c602ab40007b900080100a40014032ab40007b9000801001c64b8003136091509852bb8005003360a1c360b03360c150c1509a200212a2ab40007150bb900510200150a840a012bb70053840c01840b01a7ffde15089900df1d360915091c602ab4000fb60015a40012032ab4000fb600151c64b8003136091509852bb80050bb0054591509b700553a0a03360b1c360c03360d150d1509a2009d2ab4000f150cb60056c000253a0e190ec7000d2b03b9004f02
00a70077190eb600573a0f190fc700132b04b9004f0200190e2bb80058a7005b190a190fb900590200c0005a3a101910c700292b05b9004f0200150b840b01b8004e3a10190a190f1910b9003c030057190e2bb80058a700222b06b9004f0200190e2b03b6005b190e190fb6005c1910b6005d852bb80050840d01840c01a7ff62b1
com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList$Chunker,3
fromData,10,bb000959120ab7000bbf
@@ -1976,8 +1976,8 @@ fromData,212,2a2a2bb600bdb500132bb900be01003d2a1c047e04a0000704a7000403b500972ab
toData,239,2ab4001499000dbb00b05912b8b700b2bf2a2ab400132bb600b9033d2ab400979900071c04803d2b1cb900ba02002b2ab4000bb60035b900bb03002b2ab4000cb60035b900bb03002b2ab40025b60033b900ba02002ab40025b60099b9002b01004e2db9002c010099002b2db9002d0100c0002e3a042a1904b9002f0100c0006e2bb600b91904b9003001002bb800bca7ffd22b2ab40026b60033b900ba02002ab40026b60099b9002b01004e2db9002c01009900332db9002d0100c0002e3a042a1904b9002f0100c0006e2bb600b92b1904b900300100c0003eb6003fb900bb0300a7ffca2ab4001f2bb800bcb1
com/gemstone/gemfire/internal/cache/versions/VersionTag,2
-fromData,197,2bb9002201003db20014b20015b900160200990022b20014b20015122305bd001859032ab600195359041cb8001a53b9001b0400b200242a2bb900220100b600252a2bb900260100b500101c077e9900132a2bb900270100121e7eb50006a7000f2a2bb900280100027eb500061c10107e99000d2a2bb900270100b5000a2a2bb900280100b5000d2a2bb80029b500071c047e99000c2a2a2bb6002ab5000e1c057e99001e1c10087e99000e2a2ab4000eb5000fa7000c2a2a2bb6002ab5000f2ab6002bb1
-toData,269,033e0336042ab400061213a2000a0436041d07803e2ab4000a9900081d1010803e2ab4000ec6000b1c9900071d04803e2ab4000fc6001b1d05803e2ab4000f2ab4000ea6000c1c9900081d1008803eb20014b20015b900160200990022b20014b20015121705bd001859032ab600195359041db8001a53b9001b04002b1db9001c02002b2ab40002b9001c02002b2ab40010b9001d020015049900132b2ab40006121e7eb9001c0200a7000d2b2ab40006b9001f02002ab4000a99000d2b2ab4000ab9001c02002b2ab4000db9001f02002ab400072bb800202ab4000ec600101c99000c2a2ab4000e2bb600212ab4000fc6001b2ab4000f2ab4000ea600071c9a000c2a2ab4000f2bb60021b1
+fromData,187,2bb9002101003db20014b20015b900160200990018b20014b2001512222ab600181cb80019b9001a0500b200232a2bb900210100b600242a2bb900250100b500101c077e9900132a2bb900260100121d7eb50006a7000f2a2bb900270100027eb500061c10107e99000d2a2bb900260100b5000a2a2bb900270100b5000d2a2bb80028b500071c047e99000c2a2a2bb60029b5000e1c057e99001e1c10087e99000e2a2ab4000eb5000fa7000c2a2a2bb60029b5000f2ab6002ab1
+toData,259,033e0336042ab400061213a2000a0436041d07803e2ab4000a9900081d1010803e2ab4000ec6000b1c9900071d04803e2ab4000fc6001b1d05803e2ab4000f2ab4000ea6000c1c9900081d1008803eb20014b20015b900160200990018b20014b2001512172ab600181db80019b9001a05002b1db9001b02002b2ab40002b9001b02002b2ab40010b9001c020015049900132b2ab40006121d7eb9001b0200a7000d2b2ab40006b9001e02002ab4000a99000d2b2ab4000ab9001b02002b2ab4000db9001e02002ab400072bb8001f2ab4000ec600101c99000c2a2ab4000e2bb600202ab4000fc6001b2ab4000f2ab4000ea600071c9a000c2a2ab4000f2bb60020b1
com/gemstone/gemfire/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,4
fromData,282,2a2bb700082a2bb80009b5000a2a2bb9000b0100b5000c2a2bb9000d0100b5000e2a2bb9000f0100b500102a2bb9000f0100b500112a2bb9000f0100b500122a2bb9000f0100b500132a2bb9000f0100b500142a2bb9000d0100b500152a2bb9000f0100b500162a2bb80017b500042a2bb80017b500052a2bb80017b500062a2bb9000f0100b500182a2bb9000d0100b500192bb8001ab2001bb6001c9c00552bb8001dc0001e4d2cc600412cb6001fb20020b60021b6002299000d2ab20020b50023a7002c2cb6001fb20024b60021b6002299000d2ab20024b50023a700122ab20025b50023a700082a01b50023a7000e2a2bb8001dc00026b500232bb800273d1c9900162abb002859b70029b5002a2ab4002a2bb8002bb1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0f2bb8fa/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index b6687e5..d324cd1 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -72,7 +72,7 @@ json4s.version = 3.2.4
jsr305.version = 3.0.1
junit.version = 4.12
JUnitParams.version = 1.0.5
-log4j.version = 2.5
+log4j.version = 2.6.1
lucene.version = 6.0.0
mockito-core.version = 1.10.19
mockrunner.version = 1.0.8
[33/33] incubator-geode git commit: GEODE-420: Removal of more
deprecated properties and addition of new "alias" properties
Posted by ud...@apache.org.
GEODE-420: Removal of more deprecated properties and addition of new "alias" properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/806eacda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/806eacda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/806eacda
Branch: refs/heads/feature/GEODE-420
Commit: 806eacda90b618f5e76b032e268a657d269198e6
Parents: f71350a
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Jun 14 10:01:59 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 16 02:17:16 2016 +1000
----------------------------------------------------------------------
.../internal/DistributionConfig.java | 2 +-
.../gemfire/management/GemFireProperties.java | 173 ++++++++++++++++---
2 files changed, 154 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/806eacda/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 2c74d42..5ca327c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -3146,7 +3146,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} value.
* <p> Actual value of this constant is "".
- * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE = "";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/806eacda/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
index c5cf8f5..410d658 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
@@ -431,17 +431,54 @@ public class GemFireProperties {
private String httpServiceBindAddress;
private boolean startDevRestApi;
private int jmxManagerUpdateRate;
-
+
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+ */
+ @Deprecated
private boolean jmxManagerSSLEnabled;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+ */
+ @Deprecated
private String jmxManagerSSLProtocols;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+ */
+ @Deprecated
private String jmxManagerSSLCiphers;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+ */
+ @Deprecated
private boolean jmxManagerSSLRequireAuthentication;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+ */
+ @Deprecated
private String jmxManagerSSLKeyStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+ */
+ @Deprecated
private String jmxManagerSSLKeyStoreType;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+ */
+ @Deprecated
private String jmxManagerSSLKeyStorePassword;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+ */
+ @Deprecated
private String jmxManagerSSLTrustStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+ */
+ @Deprecated
private String jmxManagerSSLTrustStorePassword;
+ private String jmxManagerSSLAlias;
private boolean clusterSSLEnabled;
private String clusterSSLProtocols;
@@ -452,36 +489,148 @@ public class GemFireProperties {
private String clusterSSLKeyStorePassword;
private String clusterSSLTrustStore;
private String clusterSSLTrustStorePassword;
-
+ private String clusterSSLAlias;
+
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+ */
+ @Deprecated
private boolean serverSSLEnabled;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+ */
+ @Deprecated
private String serverSSLProtocols;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+ */
+ @Deprecated
private String serverSSLCiphers;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+ */
+ @Deprecated
private boolean serverSSLRequireAuthentication;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+ */
+ @Deprecated
private String serverSSLKeyStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+ */
+ @Deprecated
private String serverSSLKeyStoreType;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+ */
+ @Deprecated
private String serverSSLKeyStorePassword;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+ */
+ @Deprecated
private String serverSSLTrustStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+ */
+ @Deprecated
private String serverSSLTrustStorePassword;
-
+ private String serverSSLAlias;
+
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+ */
+ @Deprecated
private boolean gatewaySSLEnabled;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+ */
+ @Deprecated
private String gatewaySSLProtocols;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+ */
+ @Deprecated
private String gatewaySSLCiphers;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+ */
+ @Deprecated
private boolean gatewaySSLRequireAuthentication;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+ */
+ @Deprecated
private String gatewaySSLKeyStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+ */
+ @Deprecated
private String gatewaySSLKeyStoreType;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+ */
+ @Deprecated
private String gatewaySSLKeyStorePassword;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+ */
+ @Deprecated
private String gatewaySSLTrustStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+ */
+ @Deprecated
private String gatewaySSLTrustStorePassword;
-
+ private String gatewaySSLAlias;
+
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLEnabled}
+ */
+ @Deprecated
private boolean httpServiceSSLEnabled;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLRequireAuthentication}
+ */
+ @Deprecated
private boolean httpServiceSSLRequireAuthentication;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLProtocols}
+ */
+ @Deprecated
private String httpServiceSSLProtocols;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLCiphers}
+ */
+ @Deprecated
private String httpServiceSSLCiphers;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStore}
+ */
+ @Deprecated
private String httpServiceSSLKeyStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStoreType}
+ */
+ @Deprecated
private String httpServiceSSLKeyStoreType;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLKeyStorePassword}
+ */
+ @Deprecated
private String httpServiceSSLKeyStorePassword;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStore}
+ */
+ @Deprecated
private String httpServiceSSLTrustStore;
+ /**
+ * @deprecated Geode 1.0 use {@link #clusterSSLTrustStorePassword}
+ */
+ @Deprecated
private String httpServiceSSLTrustStorePassword;
+ private String httpServiceSSLAlias;
/**
* Specifies whether the default transaction mode should be distributed.
@@ -590,22 +739,6 @@ public class GemFireProperties {
return logDiskSpaceLimit;
}
-// public boolean isSslEnabled() {
-// return sslEnabled;
-// }
-//
-// public String getSslCiphers() {
-// return sslCiphers;
-// }
-//
-// public String getSslProtocols() {
-// return sslProtocols;
-// }
-//
-// public boolean isSslRequireAuthentication() {
-// return sslRequireAuthentication;
-// }
-
public int getSocketLeaseTime() {
return socketLeaseTime;
}
[28/33] incubator-geode git commit: GEODE-420: Initial Alias
defintion and removal of deprecated SSL-ENABLED properties
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
index 550a6cb..37f705b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.FixedPartitionAttributes;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
@@ -62,7 +61,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
/**
* This class checks and verifies various data and operations exposed through
* MemberMXBean interface.
- *
+ * <p>
* Goal of the Test : MemberMBean gets created once cache is created. Data like
* config data and stats are of proper value To check proper federation of
* MemberMBean including remote ops and remote data access
@@ -74,16 +73,8 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
private final String VERIFY_REMOTE_CONFIG_METHOD = "verifyConfigDataRemote";
- static final String REGION_NAME = "MANAGEMENT_TEST_REGION";
-
- static final String PARTITIONED_REGION_NAME = "MANAGEMENT_PAR_REGION";
-
- static final String FIXED_PR_NAME = "MANAGEMENT_FIXED_PR";
-
- static List<FixedPartitionAttributes> fpaList = new ArrayList<FixedPartitionAttributes>();
-
static final List<Notification> notifList = new ArrayList<Notification>();
-
+
// This must be bigger than the dunit ack-wait-threshold for the revoke
// tests. The command line is setting the ack-wait-threshold to be
// 60 seconds.
@@ -91,19 +82,17 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
@Test
public void testGemFireConfigData() throws Exception {
- initManagement(false);
-
+ initManagement(false);
+
Map<DistributedMember, DistributionConfig> configMap = new HashMap<DistributedMember, DistributionConfig>();
for (VM vm : getManagedNodeList()) {
- Map<DistributedMember, DistributionConfig> configMapMember = (Map<DistributedMember, DistributionConfig>) vm
- .invoke(CacheManagementDUnitTest.class, VERIFY_CONFIG_METHOD);
+ Map<DistributedMember, DistributionConfig> configMapMember = (Map<DistributedMember, DistributionConfig>) vm.invoke(CacheManagementDUnitTest.class, VERIFY_CONFIG_METHOD);
configMap.putAll(configMapMember);
}
Object[] args = new Object[1];
args[0] = configMap;
- getManagingNode().invoke(
- CacheManagementDUnitTest.class, VERIFY_REMOTE_CONFIG_METHOD, args);
+ getManagingNode().invoke(CacheManagementDUnitTest.class, VERIFY_REMOTE_CONFIG_METHOD, args);
}
/**
@@ -112,18 +101,16 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
@Test
public void testMemberMBeanOperations() throws Exception {
initManagement(false);
-
+
for (VM vm : managedNodeList) {
-
+
//Do some operations to fill the logs
-
- createLocalRegion(vm,"testRegion");
+
+ createLocalRegion(vm, "testRegion");
String log = (String) vm.invoke(() -> CacheManagementDUnitTest.fetchLog());
assertNotNull(log);
- LogWriterUtils.getLogWriter().info(
- "<ExpectedString> Log Of Member is " + log.toString()
- + "</ExpectedString> ");
+ LogWriterUtils.getLogWriter().info("<ExpectedString> Log Of Member is " + log.toString() + "</ExpectedString> ");
vm.invoke(() -> CacheManagementDUnitTest.fetchJVMMetrics());
@@ -131,12 +118,11 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
vm.invoke(() -> CacheManagementDUnitTest.shutDownMember());
}
-
+
VM managingNode = getManagingNode();
Object[] args = new Object[1];
args[0] = 1;// Only locator member wont be shutdown
- managingNode.invoke(CacheManagementDUnitTest.class,
- "assertExpectedMembers", args);
+ managingNode.invoke(CacheManagementDUnitTest.class, "assertExpectedMembers", args);
}
/**
@@ -146,7 +132,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
public void testMemberMBeanOpsRemote() throws Exception {
initManagement(false);
getManagingNode().invoke(() -> CacheManagementDUnitTest.invokeRemoteOps());
- }
+ }
/**
* Creates and starts a manager.
@@ -167,7 +153,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
// Only creates a cache in Managing Node
// Does not start the manager
createManagementCache(managingNode);
-
+
node3.invoke(() -> CacheManagementDUnitTest.startManager());
// Now start Managing node manager. System will have two Managers now which
@@ -177,7 +163,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
checkManagerView(managingNode, member);
stopManagingNode(managingNode);
}
-
+
/**
* Creates and starts a manager.
* Multiple Managers
@@ -197,16 +183,16 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
// Only creates a cache in Managing Node
// Does not start the manager
createManagementCache(managingNode);
-
+
startManagingNode(managingNode);
DistributedMember member = getMember(managingNode);
checkManagerView(managingNode, member);
stopManagingNode(managingNode);
checkNonManagerView(managingNode);
}
-
+
@Test
- public void testServiceCloseManagedNode() throws Exception{
+ public void testServiceCloseManagedNode() throws Exception {
List<VM> managedNodeList = getManagedNodeList();
VM node1 = managedNodeList.get(0);
VM node2 = managedNodeList.get(1);
@@ -220,15 +206,15 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
// Only creates a cache in Managing Node
// Does not start the manager
createManagementCache(managingNode);
-
+
node3.invoke(() -> CacheManagementDUnitTest.startManager());
-
+
closeCache(node3);
validateServiceResource(node3);
}
-
+
@Test
- public void testGetMBean() throws Exception{
+ public void testGetMBean() throws Exception {
List<VM> managedNodeList = getManagedNodeList();
VM node1 = managedNodeList.get(0);
VM node2 = managedNodeList.get(1);
@@ -240,14 +226,14 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
createCache(node3);
createManagementCache(managingNode);
-
+
startManagingNode(managingNode);
checkGetMBean(managingNode);
}
-
+
@Test
- public void testQueryMBeans() throws Exception{
+ public void testQueryMBeans() throws Exception {
List<VM> managedNodeList = getManagedNodeList();
VM node1 = managedNodeList.get(0);
VM node2 = managedNodeList.get(1);
@@ -259,27 +245,24 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
createCache(node3);
createManagementCache(managingNode);
-
+
startManagingNode(managingNode);
checkQueryMBeans(managingNode);
}
protected void checkQueryMBeans(final VM vm) {
- SerializableRunnable validateServiceResource = new SerializableRunnable(
- "Check Query MBeans") {
+ SerializableRunnable validateServiceResource = new SerializableRunnable("Check Query MBeans") {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- Set<DistributedMember> otherMembers = cache.getDistributionManager()
- .getOtherNormalDistributionManagerIds();
-
+ Set<DistributedMember> otherMembers = cache.getDistributionManager().getOtherNormalDistributionManagerIds();
+
Set<ObjectName> superSet = new HashSet<ObjectName>();
for (DistributedMember member : otherMembers) {
- ObjectName memberMBeanName = managementService
- .getMemberMBeanName(member);
+ ObjectName memberMBeanName = managementService.getMemberMBeanName(member);
waitForProxy(memberMBeanName, MemberMXBean.class);
Set<ObjectName> names = managementService.queryMBeanNames(member);
@@ -288,8 +271,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
}
- Set<ObjectName> names = managementService.queryMBeanNames(cache
- .getDistributedSystem().getDistributedMember());
+ Set<ObjectName> names = managementService.queryMBeanNames(cache.getDistributedSystem().getDistributedMember());
assertTrue(!superSet.contains(names));
}
};
@@ -298,31 +280,24 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
}
protected void checkGetMBean(final VM vm) {
- SerializableRunnable validateServiceResource = new SerializableRunnable(
- "Check Get MBean") {
+ SerializableRunnable validateServiceResource = new SerializableRunnable("Check Get MBean") {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- Set<DistributedMember> otherMembers = cache.getDistributionManager()
- .getOtherNormalDistributionManagerIds();
+ Set<DistributedMember> otherMembers = cache.getDistributionManager().getOtherNormalDistributionManagerIds();
for (DistributedMember member : otherMembers) {
-
- ObjectName memberMBeanName = managementService
- .getMemberMBeanName(member);
-
+
+ ObjectName memberMBeanName = managementService.getMemberMBeanName(member);
+
waitForProxy(memberMBeanName, MemberMXBean.class);
-
- MemberMXBean bean = managementService.getMBeanInstance(memberMBeanName,
- MemberMXBean.class);
+
+ MemberMXBean bean = managementService.getMBeanInstance(memberMBeanName, MemberMXBean.class);
assertNotNull(bean);
}
- DistributedMember thisMember = cache.getDistributedSystem()
- .getDistributedMember();
- ObjectName memberMBeanName = managementService
- .getMemberMBeanName(thisMember);
- MemberMXBean bean = managementService.getMBeanInstance(memberMBeanName,
- MemberMXBean.class);
+ DistributedMember thisMember = cache.getDistributedSystem().getDistributedMember();
+ ObjectName memberMBeanName = managementService.getMemberMBeanName(thisMember);
+ MemberMXBean bean = managementService.getMBeanInstance(memberMBeanName, MemberMXBean.class);
assertNotNull(bean);
}
@@ -331,28 +306,25 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
}
protected void validateServiceResource(final VM vm) {
- SerializableRunnable validateServiceResource = new SerializableRunnable(
- "Valideate Management Service Resource") {
+ SerializableRunnable validateServiceResource = new SerializableRunnable("Valideate Management Service Resource") {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
assertNull(cache);
assertFalse(managementService.isManager());
-
- SystemManagementService service = (SystemManagementService)managementService;
+
+ SystemManagementService service = (SystemManagementService) managementService;
assertNull(service.getLocalManager());
}
};
vm.invoke(validateServiceResource);
}
-
+
/**
* Creates a Distributed Region
*/
- protected AsyncInvocation checkManagerView(final VM vm,
- final DistributedMember oneManager) {
- SerializableRunnable createRegion = new SerializableRunnable(
- "Check Manager View") {
+ protected AsyncInvocation checkManagerView(final VM vm, final DistributedMember oneManager) {
+ SerializableRunnable createRegion = new SerializableRunnable("Check Manager View") {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
@@ -363,25 +335,24 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
//Ensure Data getting federated from Managing node
long t1 = bean.getMemberUpTime();
try {
- this.wait(ManagementConstants.REFRESH_TIME *3);
+ this.wait(ManagementConstants.REFRESH_TIME * 3);
} catch (InterruptedException e) {
fail("interrupted");
}
long t2 = bean.getMemberUpTime();
-
- assertTrue(t2>t1);
-
+
+ assertTrue(t2 > t1);
+
}
};
return vm.invokeAsync(createRegion);
}
-
+
/**
* Add any Manager clean up asserts here
*/
protected void checkNonManagerView(final VM vm) {
- SerializableRunnable checkNonManagerView = new SerializableRunnable(
- "Check Non Manager View") {
+ SerializableRunnable checkNonManagerView = new SerializableRunnable("Check Non Manager View") {
public void run() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
@@ -390,16 +361,13 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
SystemManagementService service = (SystemManagementService) managementService;
assertTrue(service.getLocalManager().isRunning());
- assertFalse(service.getLocalManager().getFederationSheduler()
- .isShutdown());
+ assertFalse(service.getLocalManager().getFederationSheduler().isShutdown());
// Check for Proxies
- Set<DistributedMember> otherMembers = cache.getDistributionManager()
- .getOtherNormalDistributionManagerIds();
+ Set<DistributedMember> otherMembers = cache.getDistributionManager().getOtherNormalDistributionManagerIds();
assertTrue(otherMembers.size() > 0);
for (DistributedMember member : otherMembers) {
- Set<ObjectName> proxyNames = service.getFederatingManager()
- .getProxyFactory().findAllProxies(member);
+ Set<ObjectName> proxyNames = service.getFederatingManager().getProxyFactory().findAllProxies(member);
assertTrue(proxyNames.isEmpty());
ObjectName proxyMBeanName = service.getMemberMBeanName(member);
assertFalse(MBeanJMXAdapter.mbeanServer.isRegistered(proxyMBeanName));
@@ -409,12 +377,11 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
};
vm.invoke(checkNonManagerView);
}
-
+
public static Map<DistributedMember, DistributionConfig> verifyConfigData() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
ManagementService service = getManagementService();
- DistributionConfig config = ((InternalDistributedSystem) cache
- .getDistributedSystem()).getConfig();
+ DistributionConfig config = ((InternalDistributedSystem) cache.getDistributedSystem()).getConfig();
MemberMXBean bean = service.getMemberMXBean();
GemFireProperties data = bean.listGemFireProperties();
assertConfigEquals(config, data);
@@ -427,11 +394,9 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
* This is to check whether the config data has been propagated to the
* Managing node properly or not.
*/
- public static void verifyConfigDataRemote(
- Map<DistributedMember, DistributionConfig> configMap) throws Exception {
+ public static void verifyConfigDataRemote(Map<DistributedMember, DistributionConfig> configMap) throws Exception {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- Set<DistributedMember> otherMemberSet = cache.getDistributionManager()
- .getOtherNormalDistributionManagerIds();
+ Set<DistributedMember> otherMemberSet = cache.getDistributionManager().getOtherNormalDistributionManagerIds();
for (DistributedMember member : otherMemberSet) {
MemberMXBean bean = MBeanUtil.getMemberMbeanProxy(member);
@@ -445,23 +410,18 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
* Asserts that distribution config and gemfireProperty composite types hold
* the same values
*/
- public static void assertConfigEquals(DistributionConfig config,
- GemFireProperties data) {
+ public static void assertConfigEquals(DistributionConfig config, GemFireProperties data) {
assertEquals(data.getMemberName(), config.getName());
// **TODO **
String memberGroups = null;
assertEquals(data.getMcastPort(), config.getMcastPort());
- assertEquals(data.getMcastAddress(), config.getMcastAddress()
- .getHostAddress());
+ assertEquals(data.getMcastAddress(), config.getMcastAddress().getHostAddress());
assertEquals(data.getBindAddress(), config.getBindAddress());
assertEquals(data.getTcpPort(), config.getTcpPort());
- assertEquals(removeVMDir(data.getCacheXMLFile()), removeVMDir(config.getCacheXmlFile()
- .getAbsolutePath()));
+ assertEquals(removeVMDir(data.getCacheXMLFile()), removeVMDir(config.getCacheXmlFile().getAbsolutePath()));
// **TODO **
- String configFile = null;
- String configFile1 = null;
assertEquals(data.getMcastTTL(), config.getMcastTtl());
assertEquals(data.getServerBindAddress(), config.getServerBindAddress());
assertEquals(data.getLocators(), config.getLocators());
@@ -469,44 +429,34 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
assertEquals(removeVMDir(data.getStartLocator()), removeVMDir(config.getStartLocator()));
assertEquals(removeVMDir(data.getLogFile()), removeVMDir(config.getLogFile().getAbsolutePath()));
assertEquals(data.getLogLevel(), config.getLogLevel());
- assertEquals(data.isStatisticSamplingEnabled(), config
- .getStatisticSamplingEnabled());
- assertEquals(removeVMDir(data.getStatisticArchiveFile()), removeVMDir(config
- .getStatisticArchiveFile().getAbsolutePath()));
+ assertEquals(data.isStatisticSamplingEnabled(), config.getStatisticSamplingEnabled());
+ assertEquals(removeVMDir(data.getStatisticArchiveFile()), removeVMDir(config.getStatisticArchiveFile().getAbsolutePath()));
// ** TODO **
String includeFile = null;
assertEquals(data.getAckWaitThreshold(), config.getAckWaitThreshold());
- assertEquals(data.getAckSevereAlertThreshold(), config
- .getAckSevereAlertThreshold());
- assertEquals(data.getArchiveFileSizeLimit(), config
- .getArchiveFileSizeLimit());
- assertEquals(data.getArchiveDiskSpaceLimit(), config
- .getArchiveDiskSpaceLimit());
+ assertEquals(data.getAckSevereAlertThreshold(), config.getAckSevereAlertThreshold());
+ assertEquals(data.getArchiveFileSizeLimit(), config.getArchiveFileSizeLimit());
+ assertEquals(data.getArchiveDiskSpaceLimit(), config.getArchiveDiskSpaceLimit());
assertEquals(data.getLogFileSizeLimit(), config.getLogFileSizeLimit());
assertEquals(data.getLogDiskSpaceLimit(), config.getLogDiskSpaceLimit());
- assertEquals(data.isSslEnabled(), config.getSSLEnabled());
- assertEquals(data.getSslCiphers(), config.getSSLCiphers());
- assertEquals(data.getSslProtocols(), config.getSSLProtocols());
- assertEquals(data.isSslRequireAuthentication(), config
- .getSSLRequireAuthentication());
+ assertEquals(data.isClusterSSLEnabled(), config.getClusterSSLEnabled());
+
+ assertEquals(data.getClusterSSLCiphers(), config.getClusterSSLCiphers());
+ assertEquals(data.getClusterSSLProtocols(), config.getClusterSSLProtocols());
+ assertEquals(data.isClusterSSLRequireAuthentication(), config.getClusterSSLRequireAuthentication());
assertEquals(data.getSocketLeaseTime(), config.getSocketLeaseTime());
assertEquals(data.getSocketBufferSize(), config.getSocketBufferSize());
assertEquals(data.getMcastSendBufferSize(), config.getMcastSendBufferSize());
assertEquals(data.getMcastRecvBufferSize(), config.getMcastRecvBufferSize());
- assertEquals(data.getMcastByteAllowance(), config.getMcastFlowControl()
- .getByteAllowance());
- assertEquals(data.getMcastRechargeThreshold(), config.getMcastFlowControl()
- .getRechargeThreshold(), 0);
- assertEquals(data.getMcastRechargeBlockMs(), config.getMcastFlowControl()
- .getRechargeBlockMs());
+ assertEquals(data.getMcastByteAllowance(), config.getMcastFlowControl().getByteAllowance());
+ assertEquals(data.getMcastRechargeThreshold(), config.getMcastFlowControl().getRechargeThreshold(), 0);
+ assertEquals(data.getMcastRechargeBlockMs(), config.getMcastFlowControl().getRechargeBlockMs());
assertEquals(data.getUdpFragmentSize(), config.getUdpFragmentSize());
assertEquals(data.getUdpSendBufferSize(), config.getUdpSendBufferSize());
assertEquals(data.getUdpRecvBufferSize(), config.getUdpRecvBufferSize());
assertEquals(data.isDisableTcp(), config.getDisableTcp());
- assertEquals(data.isEnableTimeStatistics(), config
- .getEnableTimeStatistics());
- assertEquals(data.isEnableNetworkPartitionDetection(), config
- .getEnableNetworkPartitionDetection());
+ assertEquals(data.isEnableTimeStatistics(), config.getEnableTimeStatistics());
+ assertEquals(data.isEnableNetworkPartitionDetection(), config.getEnableNetworkPartitionDetection());
assertEquals(data.getMemberTimeout(), config.getMemberTimeout());
int[] configPortRange = config.getMembershipPortRange();
@@ -518,39 +468,25 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
}
assertEquals(data.isConserveSockets(), config.getConserveSockets());
assertEquals(data.getRoles(), config.getRoles());
- assertEquals(data.getMaxWaitTimeForReconnect(), config
- .getMaxWaitTimeForReconnect());
- assertEquals(data.getMaxNumReconnectTries(), config
- .getMaxNumReconnectTries());
- assertEquals(data.getAsyncDistributionTimeout(), config
- .getAsyncDistributionTimeout());
+ assertEquals(data.getMaxWaitTimeForReconnect(), config.getMaxWaitTimeForReconnect());
+ assertEquals(data.getMaxNumReconnectTries(), config.getMaxNumReconnectTries());
+ assertEquals(data.getAsyncDistributionTimeout(), config.getAsyncDistributionTimeout());
assertEquals(data.getAsyncQueueTimeout(), config.getAsyncQueueTimeout());
assertEquals(data.getAsyncMaxQueueSize(), config.getAsyncMaxQueueSize());
assertEquals(data.getClientConflation(), config.getClientConflation());
assertEquals(data.getDurableClientId(), config.getDurableClientId());
- assertEquals(data.getDurableClientTimeout(), config
- .getDurableClientTimeout());
- assertEquals(data.getSecurityClientAuthInit(), config
- .getSecurityClientAuthInit());
- assertEquals(data.getSecurityClientAuthenticator(), config
- .getSecurityClientAuthenticator());
- assertEquals(data.getSecurityClientDHAlgo(), config
- .getSecurityClientDHAlgo());
- assertEquals(data.getSecurityPeerAuthInit(), config
- .getSecurityPeerAuthInit());
- assertEquals(data.getSecurityClientAuthenticator(), config
- .getSecurityPeerAuthenticator());
- assertEquals(data.getSecurityClientAccessor(), config
- .getSecurityClientAccessor());
- assertEquals(data.getSecurityClientAccessorPP(), config
- .getSecurityClientAccessorPP());
+ assertEquals(data.getDurableClientTimeout(), config.getDurableClientTimeout());
+ assertEquals(data.getSecurityClientAuthInit(), config.getSecurityClientAuthInit());
+ assertEquals(data.getSecurityClientAuthenticator(), config.getSecurityClientAuthenticator());
+ assertEquals(data.getSecurityClientDHAlgo(), config.getSecurityClientDHAlgo());
+ assertEquals(data.getSecurityPeerAuthInit(), config.getSecurityPeerAuthInit());
+ assertEquals(data.getSecurityClientAuthenticator(), config.getSecurityPeerAuthenticator());
+ assertEquals(data.getSecurityClientAccessor(), config.getSecurityClientAccessor());
+ assertEquals(data.getSecurityClientAccessorPP(), config.getSecurityClientAccessorPP());
assertEquals(data.getSecurityLogLevel(), config.getSecurityLogLevel());
- assertEquals(removeVMDir(data.getSecurityLogFile()), removeVMDir(config.getSecurityLogFile()
- .getAbsolutePath()));
- assertEquals(data.getSecurityPeerMembershipTimeout(), config
- .getSecurityPeerMembershipTimeout());
- assertEquals(data.isRemoveUnresponsiveClient(), config
- .getRemoveUnresponsiveClient());
+ assertEquals(removeVMDir(data.getSecurityLogFile()), removeVMDir(config.getSecurityLogFile().getAbsolutePath()));
+ assertEquals(data.getSecurityPeerMembershipTimeout(), config.getSecurityPeerMembershipTimeout());
+ assertEquals(data.isRemoveUnresponsiveClient(), config.getRemoveUnresponsiveClient());
assertEquals(data.isDeltaPropagation(), config.getDeltaPropagation());
assertEquals(data.getRedundancyZone(), config.getRedundancyZone());
assertEquals(data.isEnforceUniqueHost(), config.getEnforceUniqueHost());
@@ -562,8 +498,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
}
public static void startManager() {
- MemberMXBean bean = getManagementService()
- .getMemberMXBean();
+ MemberMXBean bean = getManagementService().getMemberMXBean();
// When the cache is created if jmx-manager is true then we create the manager.
// So it may already exist when we get here.
if (!bean.isManagerCreated()) {
@@ -583,52 +518,43 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
assertTrue(getManagementService().isManager());
assertTrue(bean.isManager());
}
-
- public static void isManager(){
- MemberMXBean bean = getManagementService()
- .getMemberMXBean();
- if(bean.createManager()){
+
+ public static void isManager() {
+ MemberMXBean bean = getManagementService().getMemberMXBean();
+ if (bean.createManager()) {
ManagerMXBean mngrBean = getManagementService().getManagerMXBean();
try {
mngrBean.start();
} catch (JMException e) {
fail("Could not start Manager " + e);
}
- }else{
+ } else {
fail(" Could not create Manager");
}
}
public static String fetchLog() {
- MemberMXBean bean = getManagementService()
- .getMemberMXBean();
+ MemberMXBean bean = getManagementService().getMemberMXBean();
String log = bean.showLog(30);
return log;
}
public static void fetchJVMMetrics() {
- MemberMXBean bean = getManagementService()
- .getMemberMXBean();
+ MemberMXBean bean = getManagementService().getMemberMXBean();
JVMMetrics metrics = bean.showJVMMetrics();
- LogWriterUtils.getLogWriter().info(
- "<ExpectedString> JVMMetrics is " + metrics.toString()
- + "</ExpectedString> ");
+ LogWriterUtils.getLogWriter().info("<ExpectedString> JVMMetrics is " + metrics.toString() + "</ExpectedString> ");
}
public static void fetchOSMetrics() {
- MemberMXBean bean = getManagementService()
- .getMemberMXBean();
+ MemberMXBean bean = getManagementService().getMemberMXBean();
OSMetrics metrics = bean.showOSMetrics();
- LogWriterUtils.getLogWriter().info(
- "<ExpectedString> OSMetrics is " + metrics.toString()
- + "</ExpectedString> ");
+ LogWriterUtils.getLogWriter().info("<ExpectedString> OSMetrics is " + metrics.toString() + "</ExpectedString> ");
}
public static void shutDownMember() {
- MemberMXBean bean = getManagementService()
- .getMemberMXBean();
+ MemberMXBean bean = getManagementService().getMemberMXBean();
bean.shutDownMember();
}
@@ -640,8 +566,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
public boolean done() {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- Set<DistributedMember> setOfOtherMembers = cache.getDistributedSystem()
- .getAllOtherMembers();
+ Set<DistributedMember> setOfOtherMembers = cache.getDistributedSystem().getAllOtherMembers();
boolean done = (setOfOtherMembers != null && setOfOtherMembers.size() == 1);
return done;
}
@@ -651,23 +576,16 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
public static void invokeRemoteOps() throws Exception {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- Set<DistributedMember> otherMemberSet = cache.getDistributionManager()
- .getOtherNormalDistributionManagerIds();
+ Set<DistributedMember> otherMemberSet = cache.getDistributionManager().getOtherNormalDistributionManagerIds();
for (DistributedMember member : otherMemberSet) {
MemberMXBean bean = MBeanUtil.getMemberMbeanProxy(member);
JVMMetrics metrics = bean.showJVMMetrics();
- LogWriterUtils.getLogWriter().info(
- "<ExpectedString> JVMMetrics is " + metrics.toString()
- + "</ExpectedString> ");
- LogWriterUtils.getLogWriter().info(
- "<ExpectedString> OSMetrics is " + metrics.toString()
- + "</ExpectedString> ");
-
- LogWriterUtils.getLogWriter().info(
- "<ExpectedString> Boolean Data Check " +bean.isManager()
- + "</ExpectedString> ");
+ LogWriterUtils.getLogWriter().info("<ExpectedString> JVMMetrics is " + metrics.toString() + "</ExpectedString> ");
+ LogWriterUtils.getLogWriter().info("<ExpectedString> OSMetrics is " + metrics.toString() + "</ExpectedString> ");
+
+ LogWriterUtils.getLogWriter().info("<ExpectedString> Boolean Data Check " + bean.isManager() + "</ExpectedString> ");
}
}
@@ -716,7 +634,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
// Step : 3 : Verify Notification count, notification region sizes
countNotificationsAndCheckRegionSize(node1, node2, node3, managingNode);
}
-
+
@Test
public void testRedundancyZone() throws Exception {
List<VM> managedNodeList = getManagedNodeList();
@@ -725,9 +643,9 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
VM node3 = managedNodeList.get(2);
Properties props = new Properties();
props.setProperty(REDUNDANCY_ZONE, "ARMY_ZONE");
-
- createCache(node1,props);
-
+
+ createCache(node1, props);
+
node1.invoke(new SerializableRunnable("Assert Redundancy Zone") {
public void run() {
@@ -766,7 +684,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
};
vm.invoke(attchListenerToDSMBean);
}
-
+
public void waitForManagerToRegisterListener() {
SystemManagementService service = (SystemManagementService) getManagementService();
final Map<ObjectName, NotificationHubListener> hubMap = service.getNotificationHub().getListenerObjectMap();
@@ -794,57 +712,10 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
final String appender2 = MBeanJMXAdapter.getUniqueIDForMember(member2);
final String appender3 = MBeanJMXAdapter.getUniqueIDForMember(member3);
- node1.invoke(new SerializableRunnable("Create Regions") {
+ node1.invoke("Create Regions", () -> createNotifTestRegion(appender1));
+ node2.invoke("Create Regions", () -> createNotifTestRegion(appender2));
+ node3.invoke("Create Regions", () -> createNotifTestRegion(appender3));
- public void run() {
-
- Cache cache = getCache();
-
- waitForManagerToRegisterListener();
- RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- for (int i = 1; i <= 15; i++) {
- rf.create("NotifTestRegion_"+ i);
- }
- Region member1NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender1);
-
- assertEquals(0, member1NotifRegion.size());
-
- }
- });
-
- node2.invoke(new SerializableRunnable("Create Regions") {
-
- public void run() {
-
- Cache cache = getCache();
- waitForManagerToRegisterListener();
- RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- for (int i = 1; i <= 15; i++) {
- rf.create("NotifTestRegion_" + i);
- }
-
- Region member2NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender2);
-
- assertEquals(0, member2NotifRegion.size());
- }
- });
-
- node3.invoke(new SerializableRunnable("Create Regions") {
-
- public void run() {
-
- Cache cache = getCache();
- waitForManagerToRegisterListener();
- RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- for (int i = 1; i <= 15; i++) {
- rf.create("NotifTestRegion_" + i);
- }
-
- Region member3NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender3);
-
- assertEquals(0, member3NotifRegion.size());
- }
- });
managingNode.invoke(new SerializableRunnable("Validate Notification Count") {
public void run() {
@@ -865,9 +736,9 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
Cache cache = getCache();
SystemManagementService service = (SystemManagementService) getManagementService();
- Region member1NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender1);
- Region member2NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender2);
- Region member3NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender3);
+ Region member1NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender1);
+ Region member2NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender2);
+ Region member3NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender3);
// Even though we got 15 notification only 10 should be there due to
// eviction attributes set in notification region
@@ -880,4 +751,17 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
}
+ private void createNotifTestRegion(final String appender1) {
+ Cache cache = getCache();
+
+ waitForManagerToRegisterListener();
+ RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
+ for (int i = 1; i <= 15; i++) {
+ rf.create("NotifTestRegion_" + i);
+ }
+ Region member1NotifRegion = cache.getRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender1);
+
+ assertEquals(0, member1NotifRegion.size());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 5457ed3..6d3079c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -860,10 +860,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final Properties serverProperties = getSystem().getProperties();
//Below removed properties are already got copied as cluster SSL properties
- serverProperties.remove(SSL_ENABLED);
- serverProperties.remove(SSL_CIPHERS);
- serverProperties.remove(SSL_PROTOCOLS);
- serverProperties.remove(SSL_REQUIRE_AUTHENTICATION);
+ serverProperties.remove(CLUSTER_SSL_ENABLED);
+ serverProperties.remove(CLUSTER_SSL_CIPHERS);
+ serverProperties.remove(CLUSTER_SSL_PROTOCOLS);
+ serverProperties.remove(CLUSTER_SSL_REQUIRE_AUTHENTICATION);
getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
@@ -1556,10 +1556,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final String serverMemberId = serverMember.toString();
final Properties serverProperties = getSystem().getProperties();
- serverProperties.remove(SSL_ENABLED);
- serverProperties.remove(SSL_CIPHERS);
- serverProperties.remove(SSL_PROTOCOLS);
- serverProperties.remove(SSL_REQUIRE_AUTHENTICATION);
+ serverProperties.remove(CLUSTER_SSL_ENABLED);
+ serverProperties.remove(CLUSTER_SSL_CIPHERS);
+ serverProperties.remove(CLUSTER_SSL_PROTOCOLS);
+ serverProperties.remove(CLUSTER_SSL_REQUIRE_AUTHENTICATION);
getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index 7a96adf..b14a3d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -101,12 +101,12 @@ public class HTTPServiceSSLSupportJUnitTest {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(SSL_ENABLED, "true");
+ localProps.setProperty(CLUSTER_SSL_ENABLED, "true");
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStore", jks.getCanonicalPath());
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStorePassword", "password");
- localProps.setProperty(SSL_PROTOCOLS, "SSL");
- localProps.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
+ localProps.setProperty(CLUSTER_SSL_PROTOCOLS, "SSL");
+ localProps.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStore", jks.getCanonicalPath());
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStorePassword", "password");
@@ -129,10 +129,10 @@ public class HTTPServiceSSLSupportJUnitTest {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(SSL_ENABLED, "true");
+ localProps.setProperty(CLUSTER_SSL_ENABLED, "true");
- localProps.setProperty(SSL_PROTOCOLS, "SSL");
- localProps.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
+ localProps.setProperty(CLUSTER_SSL_PROTOCOLS, "SSL");
+ localProps.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
Properties sslProps = new Properties();
sslProps.setProperty("javax.net.ssl.keyStore", jks.getCanonicalPath());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
index c591732..6b6e3de 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
@@ -114,10 +114,10 @@ public class SSLCredentialGenerator extends CredentialGenerator {
private Properties getSSLProperties() {
Properties props = new Properties();
- props.setProperty(SSL_ENABLED, "true");
- props.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
- props.setProperty(SSL_CIPHERS, "SSL_RSA_WITH_3DES_EDE_CBC_SHA");
- props.setProperty(SSL_PROTOCOLS, "TLSv1");
+ props.setProperty(CLUSTER_SSL_CIPHERS, "true");
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+ props.setProperty(CLUSTER_SSL_CIPHERS, "SSL_RSA_WITH_3DES_EDE_CBC_SHA");
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, "TLSv1");
return props;
}
}
[02/33] incubator-geode git commit: GEODE-1516: update Eclipse and
IntelliJ handling of imports
Posted by ud...@apache.org.
GEODE-1516: update Eclipse and IntelliJ handling of imports
* add etc/eclipseOrganizeImports.importorder because Eclipse uses two different config files
** eclipseFormatterProfile.xml is used for Java | Code Style | Formatter
** eclipseOrganizeImports.importorder is used for Java | Code Style | Organize Imports
* update intellijIdeaCodeStyle.xml to match the best common denominator between IntelliJ and Eclipse so that both import organizers will produce exact same results
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/94a4b4a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/94a4b4a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/94a4b4a5
Branch: refs/heads/feature/GEODE-420
Commit: 94a4b4a52ee5a762f1fe22773f67be09eea43950
Parents: 4bb9bae
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu Jun 9 15:33:44 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jun 9 15:37:51 2016 -0700
----------------------------------------------------------------------
etc/eclipseOrganizeImports.importorder | 7 +++++++
etc/intellijIdeaCodeStyle.xml | 9 +--------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94a4b4a5/etc/eclipseOrganizeImports.importorder
----------------------------------------------------------------------
diff --git a/etc/eclipseOrganizeImports.importorder b/etc/eclipseOrganizeImports.importorder
new file mode 100644
index 0000000..01999e8
--- /dev/null
+++ b/etc/eclipseOrganizeImports.importorder
@@ -0,0 +1,7 @@
+#Organize Import Order
+#Thu Jun 09 15:31:09 PDT 2016
+4=com.gemstone
+3=
+2=javax
+1=java
+0=\#
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/94a4b4a5/etc/intellijIdeaCodeStyle.xml
----------------------------------------------------------------------
diff --git a/etc/intellijIdeaCodeStyle.xml b/etc/intellijIdeaCodeStyle.xml
index a6d1f25..0c3a6d70 100755
--- a/etc/intellijIdeaCodeStyle.xml
+++ b/etc/intellijIdeaCodeStyle.xml
@@ -25,19 +25,12 @@
<package name="" withSubpackages="true" static="true" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" />
+ <emptyLine />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
- <package name="batterytest" withSubpackages="true" static="false" />
- <package name="cacheRunner" withSubpackages="true" static="false" />
- <package name="hydra" withSubpackages="true" static="false" />
- <package name="parReg" withSubpackages="true" static="false" />
- <package name="perffmwk" withSubpackages="true" static="false" />
- <emptyLine />
<package name="com.gemstone" withSubpackages="true" static="false" />
- <package name="com.vmware.gemfire" withSubpackages="true" static="false" />
- <package name="io.pivotal.geode" withSubpackages="true" static="false" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
[06/33] incubator-geode git commit: GEODE-1528: CacheFactory javadocs
point to the wrong place for DistributedSystem properties
Posted by ud...@apache.org.
GEODE-1528: CacheFactory javadocs point to the wrong place for DistributedSystem properties
Modified DistributedSystem and CacheFactory to point to the new
ConfigurationProperties interface for property names and meanings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e831aa06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e831aa06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e831aa06
Branch: refs/heads/feature/GEODE-420
Commit: e831aa06268e3d80bb13eec56b9da1b863d5e0f1
Parents: d28ac95
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Jun 10 14:16:15 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Jun 10 14:17:56 2016 -0700
----------------------------------------------------------------------
.../main/java/com/gemstone/gemfire/cache/CacheFactory.java | 7 +++++--
.../com/gemstone/gemfire/distributed/DistributedSystem.java | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e831aa06/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
old mode 100755
new mode 100644
index a5bcf59..991b27f
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.cache;
import java.util.Properties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.GemFireVersion;
@@ -93,7 +94,8 @@ public class CacheFactory {
}
/**
* Create a CacheFactory initialized with the given gemfire properties.
- * For a list of valid gemfire properties see {@link DistributedSystem}.
+ * For a list of valid GemFire properties and their meanings
+ * see {@linkplain ConfigurationProperties}.
* @param props the gemfire properties to initialize the factory with.
* @since GemFire 6.5
*/
@@ -106,7 +108,8 @@ public class CacheFactory {
/**
* Sets a gemfire property that will be used when creating the Cache.
- * For a list of valid gemfire properties see {@link DistributedSystem}.
+ * For a list of valid GemFire properties and their meanings
+ * see {@link ConfigurationProperties}.
* @param name the name of the gemfire property
* @param value the value of the gemfire property
* @return a reference to this CacheFactory object
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e831aa06/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
old mode 100755
new mode 100644
index d14d5a9..46feef9
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -109,8 +109,10 @@ public abstract class DistributedSystem implements StatisticsFactory {
/**
* Connects to a GemFire distributed system with a configuration
- * supplemented by the given properties.
- * <P>The actual configuration attribute values used to connect comes
+ * supplemented by the given properties. See {@linkplain ConfigurationProperties}
+ * for available GemFire properties and their meanings.
+ * <P>
+ * The actual configuration attribute values used to connect comes
* from the following sources:
* <OL>
* <LI>System properties. If a system property named
[17/33] incubator-geode git commit: GEODE-1443: fix PartitionResolver
javadocs
Posted by ud...@apache.org.
GEODE-1443: fix PartitionResolver javadocs
The javadocs now describes the third option of using
a callback argument as the PartitionResolver.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4afc5b15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4afc5b15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4afc5b15
Branch: refs/heads/feature/GEODE-420
Commit: 4afc5b1531d1b10afd7f40beaa535a49abd22282
Parents: e84e885
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 14 10:26:50 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jun 14 10:26:50 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/cache/PartitionResolver.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4afc5b15/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
index 562a42b..253a108 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
@@ -18,19 +18,24 @@ package com.gemstone.gemfire.cache;
/**
* Implementers of interface <code>PartitionResolver</code> enable custom
- * partitioning on the <code>PartitionedRegion</code>.<br>
+ * standard partitioning on the <code>PartitionedRegion</code>.<br>
+ * See <code>FixedPartitionResolver</code> to enable custom fixed partitioning.<br>
* <p>
- * 1. The Key class can implement PartitionResolver interface to
- * enable custom partitioning OR <br>
- * 2. Configure your own PartitionResolver class in partition attributes (For
- * instance when the Key is a primitive type or String) Implement the
+ * 1. The key class can implement the PartitionResolver interface to
+ * enable custom partitioning. OR <br>
+ * 2. Configure your own PartitionResolver class in partition attributes (for
+ * instance when the key is a JDK class like Integer or String). Implement the
* appropriate equals - For all implementations, you need to be sure to code the
* class equals method so it properly verifies equality for the
* PartitionResolver implementation. This might mean verifying that class names
* are the same or that the returned routing objects are the same etc.. When you
* initiate the partitioned region on multiple nodes, GemFire uses the equals
* method to ensure you are using the same PartitionResolver implementation for
- * all of the nodes for the region.
+ * all of the nodes for the region. OR <br>
+ * 3. The callback argument passed to the Region operation methods can implement
+ * PartitionResolver. This implementation restricts you to using methods that accept
+ * a cache callback argument to manage the region entries. For a full list of the methods
+ * that take a callback argument, see the Region Javadocs.
* </p>
* <p>
* GemFire uses the routing object's hashCode to determine where the data is
[07/33] incubator-geode git commit: GEODE-1527: Locator javadoc
mentions the old "gemfire" command
Posted by ud...@apache.org.
GEODE-1527: Locator javadoc mentions the old "gemfire" command
Altered the javadoc to point the user at gfsh instead of gemfire.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d28ac959
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d28ac959
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d28ac959
Branch: refs/heads/feature/GEODE-420
Commit: d28ac959400e49d512561f3204696d85b306e8d4
Parents: f8dd6ce
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Jun 10 14:11:42 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Jun 10 14:17:56 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/distributed/Locator.java | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d28ac959/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
index ddcc48a..8795b71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
@@ -31,13 +31,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
* Represents a distribution locator server that provides discovery information
* to members and clients of a GemFire distributed system. In most GemFire
* distributed cache architectures, distribution locators are run in their own
- * process. A stand-alone locator process is managed using
- * {@linkplain com.gemstone.gemfire.admin.DistributionLocator administration
- * API} or the <code>gemfire</code> command line utility:
- *
- * <PRE>
- * $ gemfire start-locator
- * </PRE>
+ * process. A stand-alone locator process is managed using gfsh command line utility.
*
* The stand-alone locator configuration provides high-availability of
* membership information.
@@ -47,12 +41,16 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
* This class allows a GemFire application VM to host a distribution locator.
* Such a configuration minimizes the number of processes that are required to
* run GemFire. However, hosting distribution locators is not generally
- * recommended because if the application VM exits, the primary membership list
- * for the distributed system would be lost and it would not be possible for new
- * applications to connect to the distributed system.
+ * recommended because if the application VM exits it would not be possible for new
+ * applications to connect to the distributed system until it is restarted.
*
* <P>
+ * Locators persist membership information in a locatorXXXview.dat file. This
+ * file is used to recover information about the cluster when a locator starts
+ * if there are no other currently running locators. It allows the restarted
+ * locator to rejoin the cluster.
*
+ * <P>
* <b>NOTE:</b> In this release of the product locators log membership views and
* cache server status in a locatorXXXviews.log file, where XXX is the locator's port.
* This is a rolling log
@@ -61,8 +59,8 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
* or be started so that it creates a DistributedSystem. This means that it is
* not possible in this release to use APIs to start a locator and <i>then</i>
* start a DistributedSystem.
- *
* <P>
+ *
*
* @since GemFire 4.0
*/
[19/33] incubator-geode git commit: GEODE-11: Change from
MultiFieldQueryParser to StandardQueryParser
Posted by ud...@apache.org.
GEODE-11: Change from MultiFieldQueryParser to StandardQueryParser
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/79cba4dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/79cba4dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/79cba4dc
Branch: refs/heads/feature/GEODE-420
Commit: 79cba4dcb7c28256fa17569956c8143f58388b65
Parents: 33ceb37
Author: Jason Huynh <hu...@gmail.com>
Authored: Fri Jun 3 15:14:20 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Tue Jun 14 14:55:41 2016 -0700
----------------------------------------------------------------------
.../lucene/internal/StringQueryProvider.java | 20 ++++++++++----------
.../internal/StringQueryProviderJUnitTest.java | 8 --------
2 files changed, 10 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/79cba4dc/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
index 62cb65c..2ccd58d 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
@@ -24,9 +24,8 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.logging.log4j.Logger;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
+import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
import org.apache.lucene.search.Query;
import com.gemstone.gemfire.DataSerializer;
@@ -38,10 +37,11 @@ import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.logging.LogService;
/**
- * Constructs a Lucene Query object by parsing a search string. The class uses {@link MultiFieldQueryParser}. It sets
+ * Constructs a Lucene Query object by parsing a search string. The class uses {@link StandardQueryParser}. It sets
* searchable fields in a {@link LuceneIndex} as default fields.
*/
public class StringQueryProvider implements LuceneQueryProvider, DataSerializableFixedID {
+
private static final long serialVersionUID = 1L;
private static final Logger logger = LogService.getLogger();
@@ -65,15 +65,15 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
if (luceneQuery == null) {
String[] fields = index.getFieldNames();
- LuceneIndexImpl indexImpl = (LuceneIndexImpl)index;
- MultiFieldQueryParser parser = new MultiFieldQueryParser(fields, indexImpl.getAnalyzer());
+ LuceneIndexImpl indexImpl = (LuceneIndexImpl) index;
+ StandardQueryParser parser = new StandardQueryParser(indexImpl.getAnalyzer());
try {
- luceneQuery = parser.parse(query);
+ luceneQuery = parser.parse(query, fields[0]);
if (logger.isDebugEnabled()) {
- logger.debug("User query "+query+" is parsed to be: "+luceneQuery);
+ logger.debug("User query " + query + " is parsed to be: " + luceneQuery);
}
- } catch (ParseException e) {
- logger.debug("Malformed lucene query: " + query, e);
+ } catch (QueryNodeException e) {
+ logger.debug("Query node exception:" + query, e);
throw new QueryException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/79cba4dc/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
index cfd8c32..da6715a 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -60,14 +60,6 @@ public class StringQueryProviderJUnitTest {
}
@Test
- public void usesSearchableFieldsAsDefaults() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider("findThis");
- Query query = provider.getQuery(mockIndex);
- Assert.assertNotNull(query);
- assertEquals("field-1:findthis field-2:findthis", query.toString());
- }
-
- @Test
@Ignore("Custom analyzer not yet supported, this is a duplicate test right now")
public void usesCustomAnalyzer() throws QueryException {
StringQueryProvider provider = new StringQueryProvider("findThis");
[15/33] incubator-geode git commit: GEODE-1540: fix testAsyncStats
Posted by ud...@apache.org.
GEODE-1540: fix testAsyncStats
Test now uses awaitility and if a stat never does get to the expected
value will now fail with an assertion that shows the actual and expected
value of the stat.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/de647cd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/de647cd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/de647cd7
Branch: refs/heads/feature/GEODE-420
Commit: de647cd7f9bce152481b397ea242d9ff8626c4b4
Parents: 6f70cd7
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon Jun 13 17:48:56 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon Jun 13 17:50:10 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/OplogJUnitTest.java | 51 +++++---------------
1 file changed, 13 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de647cd7/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java
index b283ec3..d8ef40c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OplogJUnitTest.java
@@ -2641,51 +2641,26 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
region = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache,
diskProps);
final DiskStoreStats dss = ((LocalRegion)region).getDiskRegion().getDiskStore().getStats();
- WaitCriterion evFull = new WaitCriterion() {
- public boolean done() {
- return dss.getQueueSize() == 100;
- }
- public String description() {
- return null;
- }
- };
- WaitCriterion ev = new WaitCriterion() {
- public boolean done() {
- return dss.getQueueSize() == 0;
- }
- public String description() {
- return null;
- }
- };
- WaitCriterion ev2 = new WaitCriterion() {
- public boolean done() {
- return dss.getFlushes() == 100;
- }
- public String description() {
- return null;
- }
- };
- WaitCriterion ev3 = new WaitCriterion() {
- public boolean done() {
- return dss.getFlushes() == 200;
- }
- public String description() {
- return null;
- }
- };
assertEquals(0, dss.getQueueSize());
put100Int();
- Wait.waitForCriterion(evFull, 2 * 1000, 200, true);
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS).timeout(10, TimeUnit.SECONDS)
+ .until(() -> assertEquals(100, dss.getQueueSize()));
+
assertEquals(0, dss.getFlushes());
region.writeToDisk();
- Wait.waitForCriterion(ev, 2 * 1000, 200, true);
- Wait.waitForCriterion(ev2, 1000, 200, true);
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS).timeout(10, TimeUnit.SECONDS)
+ .until(() -> assertEquals(0, dss.getQueueSize()));
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS).timeout(10, TimeUnit.SECONDS)
+ .until(() -> assertEquals(100, dss.getFlushes()));
put100Int();
- Wait.waitForCriterion(evFull, 2 * 1000, 200, true);
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS).timeout(10, TimeUnit.SECONDS)
+ .until(() -> assertEquals(100, dss.getQueueSize()));
region.writeToDisk();
- Wait.waitForCriterion(ev, 2 * 1000, 200, true);
- Wait.waitForCriterion(ev3, 1000, 200, true);
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS).timeout(10, TimeUnit.SECONDS)
+ .until(() -> assertEquals(0, dss.getQueueSize()));
+ Awaitility.await().pollInterval(10, TimeUnit.MILLISECONDS).pollDelay(10, TimeUnit.MILLISECONDS).timeout(10, TimeUnit.SECONDS)
+ .until(() -> assertEquals(200, dss.getFlushes()));
closeDown();
}
[27/33] incubator-geode git commit: GEODE-420: Added
SSLEnabledComponents.java
Posted by ud...@apache.org.
GEODE-420: Added SSLEnabledComponents.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/12f69bed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/12f69bed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/12f69bed
Branch: refs/heads/feature/GEODE-420
Commit: 12f69bed22a29c7b23b7299d71f776ea36fa7ed1
Parents: b6480b7
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Jun 15 10:06:42 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 16 02:17:16 2016 +1000
----------------------------------------------------------------------
.../distributed/ConfigurationProperties.java | 11 ++++
.../distributed/SSLEnabledComponents.java | 57 ++++++++++++++++++++
.../internal/AbstractDistributionConfig.java | 53 +++++++++++++++---
.../internal/DistributionConfig.java | 21 ++++++++
.../internal/DistributionConfigImpl.java | 39 ++++++++++++--
.../gemfire/internal/i18n/LocalizedStrings.java | 6 ++-
.../internal/DistributionConfigJUnitTest.java | 1 +
.../gemfire/internal/SSLConfigJUnitTest.java | 12 ++---
8 files changed, 181 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
index 207ca0d..11db1d9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -1616,10 +1616,21 @@ public interface ConfigurationProperties {
String LOCK_MEMORY = "lock-memory";
/**
* The static String definition of the <i>"shiro-init"</i> property
+ * <U>Since</U>: Geode 1.0
*/
String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
/**
* The static String definition of the <i>"distributed-transactions"</i> property
+ * <U>Since</U>: Geode 1.0
*/
String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
+ /**
+ * The static String definition of the <i>"ssl-enabled-components"</i> property
+ * <a name="ssl-enabled-components"/a></p>
+ * <U>Description</U>: This setting is a comma delimited fields which works in conjunction with the {@link #CLUSTER_SSL_PREFIX} properties.
+ * This property will determine which components will use SSL for their communications.</p>
+ * <U>Options</U>: "all","server","cluster","gateway","http","jmx" -- As described {@link SSLEnabledComponents}
+ * <U>Since</U>: Geode 1.0
+ */
+ String SSL_ENABLED_COMPONENTS = "ssl-enabled-components";
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/main/java/com/gemstone/gemfire/distributed/SSLEnabledComponents.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SSLEnabledComponents.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SSLEnabledComponents.java
new file mode 100644
index 0000000..a403662
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SSLEnabledComponents.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.distributed;
+
+/**
+ * This class defines all the static definitions for the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
+ * <U>Since</U>: Geode 1.0
+ */
+public interface SSLEnabledComponents {
+
+ /**
+ * This determines that all components will use the SSL for their communications.
+ * <U>Since</U>: Geode 1.0
+ */
+ String ALL = "all";
+ /**
+ * This determines that only the server components will use the SSL for their communications. This means that all communications
+ * between clients and servers will use SSL. In addition this also means that client-locator and server-locator communications will use SSL credentials.
+ * <U>Since</U>: Geode 1.0
+ */
+ String SERVER = "server";
+ /**
+ * This determines that only the inter-server (or server-to-server) communication will use the SSL.
+ * In addition this also means that server-locator communications will use SSL credentials.
+ * <U>Since</U>: Geode 1.0
+ */
+ String CLUSTER = "cluster";
+ /**
+ * This determines that only the jmx component will use the SSL for its communications.
+ * <U>Since</U>: Geode 1.0
+ */
+ String JMX = "jmx";
+ /**
+ * This determines that the http service component will use the SSL for its communications
+ * <U>Since</U>: Geode 1.0
+ */
+ String HTTP_SERVICE = "http";
+ /**
+ * This determines that the gateway component will use the SSL for its communications.
+ * <U>Since</U>: Geode 1.0
+ */
+ String GATEWAY = "gateway";
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index f53727b..2ffef75 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -29,9 +29,12 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
+import org.apache.commons.lang.StringUtils;
+
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.InvalidValueException;
import com.gemstone.gemfire.UnmodifiableException;
+import com.gemstone.gemfire.distributed.SSLEnabledComponents;
import com.gemstone.gemfire.internal.AbstractConfig;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.internal.SocketCreator;
@@ -367,12 +370,9 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
// Minimum 3 ports are required to start a Gemfire data node,
// One for each, UDP, FD_SOCk protocols and Cache Server.
if (value[1] - value[0] < 2) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.
- toLocalizedString(new Object[] {
- MEMBERSHIP_PORT_RANGE,
- value[0] + "-" + value[1],
- Integer.valueOf(3)
- }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {
+ MEMBERSHIP_PORT_RANGE, value[0] + "-" + value[1], Integer.valueOf(3)
+ }));
}
return value;
}
@@ -467,6 +467,45 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
return value;
}
+ /**
+ * First check if sslComponents are in the list of valid components. If so, check that no other *-ssl-* properties other than cluster-ssl-* are set.
+ * This would mean one is mixing the "old" with the "new"
+ */
+ @ConfigAttributeChecker(name = SSL_ENABLED_COMPONENTS)
+ protected String checkLegacySSLWhenSSLEnabledComponentsSet(String value) {
+ if (value != null && value.length() > 0) {
+ String[] components = value.split(",");
+ for (String component : components) {
+ switch (component) {
+ case SSLEnabledComponents.ALL:
+ case SSLEnabledComponents.CLUSTER:
+ case SSLEnabledComponents.SERVER:
+ case SSLEnabledComponents.GATEWAY:
+ case SSLEnabledComponents.JMX:
+ case SSLEnabledComponents.HTTP_SERVICE:
+ continue;
+ default:
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_0_INVALID_TRY_1.toLocalizedString(new Object[] {
+ value, StringUtils.join(new String[] {
+ SSLEnabledComponents.ALL,
+ SSLEnabledComponents.CLUSTER,
+ SSLEnabledComponents.SERVER,
+ SSLEnabledComponents.GATEWAY,
+ SSLEnabledComponents.JMX,
+ SSLEnabledComponents.HTTP_SERVICE
+ }, ",")
+ }));
+ }
+ }
+ if(getJmxManagerSSLEnabled() || getHttpServiceSSLEnabled() || getServerSSLEnabled() || getGatewaySSLEnabled())
+ {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET
+ .toLocalizedString());
+ }
+ }
+ return value;
+ }
+
// AbstractConfig overriding methods
@Override
@@ -922,6 +961,8 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
m.put(SECURITY_SHIRO_INIT, "The name of the shiro configuration file in the classpath, e.g. shiro.ini");
+ m.put(SSL_ENABLED_COMPONENTS,"A comma delimited list of components that require SSL communications");
+
dcAttDescriptions = Collections.unmodifiableMap(m);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 5ca327c..3cbe3f2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.distributed.internal;
import com.gemstone.gemfire.distributed.ConfigurationProperties;
import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.SSLEnabledComponents;
import com.gemstone.gemfire.internal.Config;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -4050,6 +4051,26 @@ public interface DistributionConfig extends Config, LogConfig {
@ConfigAttribute(type = String.class)
String SERVER_SSL_ALIAS_NAME = SERVER_SSL_ALIAS;
+ /**
+ * Returns the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
+ * property.
+ */
+ @ConfigAttributeGetter(name = SSL_ENABLED_COMPONENTS)
+ String getSSLEnabledComponents();
+
+ /**
+ * Sets the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
+ * property.
+ */
+ @ConfigAttributeSetter(name = SSL_ENABLED_COMPONENTS)
+ void setSSLEnabledComponents(String sslEnabledComponents);
+
+ /**
+ * The name of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property
+ */
+ @ConfigAttribute(type = String.class)
+ String SSL_ENABLED_COMPONENTS_NAME = SSL_ENABLED_COMPONENTS;
+
//*************** Initializers to gather all the annotations in this class ************************
Map<String, ConfigAttribute> attributes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/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 5276f3a..7ba8aee 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
@@ -228,7 +228,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
/**
* the Jgroups port ranges allowed
*/
- protected int[] membershipPortRange = DEFAULT_MEMBERSHIP_PORT_RANGE;
+ private int[] membershipPortRange = DEFAULT_MEMBERSHIP_PORT_RANGE;
/**
* Max wait time for the member before reconnecting to the DS in case of
@@ -241,9 +241,9 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private int maxNumReconnectTries = DEFAULT_MAX_NUM_RECONNECT_TRIES;
- protected int asyncDistributionTimeout = DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT;
- protected int asyncQueueTimeout = DEFAULT_ASYNC_QUEUE_TIMEOUT;
- protected int asyncMaxQueueSize = DEFAULT_ASYNC_MAX_QUEUE_SIZE;
+ private int asyncDistributionTimeout = DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT;
+ private int asyncQueueTimeout = DEFAULT_ASYNC_QUEUE_TIMEOUT;
+ private int asyncMaxQueueSize = DEFAULT_ASYNC_MAX_QUEUE_SIZE;
/**
* @since GemFire 5.7
@@ -484,6 +484,8 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private String httpServiceSSLAlias = clusterSSLAlias;
+ private String sslEnabledComponents;
+
private Map<String, ConfigSource> sourceMap = Collections.synchronizedMap(new HashMap<String, ConfigSource>());
protected String userCommandPackages = DEFAULT_USER_COMMAND_PACKAGES;
@@ -679,6 +681,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
this.httpServiceSSLAlias = other.getHTTPServiceSSLAlias();
this.jmxManagerSSLAlias = other.getJMXManagerSSLAlias();
this.serverSSLAlias = other.getServerSSLAlias();
+ this.sslEnabledComponents = ((DistributionConfigImpl) other).sslEnabledComponents;
}
/**
@@ -2336,6 +2339,16 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
serverSSLAlias = alias;
}
+ @Override
+ public String getSSLEnabledComponents() {
+ return sslEnabledComponents;
+ }
+
+ @Override
+ public void setSSLEnabledComponents(final String sslEnabledComponents) {
+ this.sslEnabledComponents = sslEnabledComponents;
+ }
+
/////////////////////// Utility Methods ///////////////////////
/**
@@ -3019,6 +3032,24 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
} else if (!userDefinedProps.equals(other.userDefinedProps)) {
return false;
}
+ if (clusterSSLAlias != other.clusterSSLAlias) {
+ return false;
+ }
+ if (serverSSLAlias != other.serverSSLAlias) {
+ return false;
+ }
+ if (httpServiceSSLAlias != other.httpServiceSSLAlias) {
+ return false;
+ }
+ if (jmxManagerSSLAlias != other.jmxManagerSSLAlias) {
+ return false;
+ }
+ if (gatewaySSLAlias != other.gatewaySSLAlias) {
+ return false;
+ }
+ if (sslEnabledComponents != other.sslEnabledComponents) {
+ return false;
+ }
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 7256b95..01b6779 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -3766,6 +3766,10 @@ public class LocalizedStrings {
public static final StringId AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0 = new StringId(6632,"SSL http service communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
public static final StringId AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0 = new StringId(6632,"SSL jmx communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_0_INVALID_TRY_1 = new StringId(6633,"\"{0}\" is not in the valid set of {1}");
+
+ public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET = new StringId(6634,"When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
+
/** Testing strings, messageId 90000-99999 **/
/** These are simple messages for testing, translated with Babelfish. **/
@@ -3777,6 +3781,4 @@ public class LocalizedStrings {
public static final StringId DistributedRegion_INITIALIZING_REGION_COMPLETED_0 = new StringId(90005, "Initialization of region {0} completed");
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 48cc42f..314f7d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -221,6 +221,7 @@ public class DistributionConfigJUnitTest {
@Test
public void testCheckerChecksValidAttribute() {
for (String att : checkers.keySet()) {
+ System.out.println("att = " + att);
assertTrue(attributes.containsKey(att));
Method checker = checkers.get(att);
assertEquals(checker.getParameterCount(), 1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/12f69bed/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
index a8e4708..ff93ad7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
@@ -333,19 +333,16 @@ public class SSLConfigJUnitTest {
String sslciphers = "any";
boolean requireAuth = true;
- boolean jmxManagerSsl = true;
boolean jmxManagerSslenabled = true;
String jmxManagerSslprotocols = "SSLv7";
String jmxManagerSslciphers = "RSA_WITH_GARBAGE";
boolean jmxManagerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
- gemFireProps.put(CLUSTER_SSL_PROTOCOLS, jmxManagerSslprotocols);
- gemFireProps.put(CLUSTER_SSL_CIPHERS, jmxManagerSslciphers);
- gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
- //TODO -- UDO: We need to potentially have to implement JMX_MANAGER_SSL_ALIAS
- gemFireProps.put(JMX_MANAGER_SSL_ALIAS, "");
+ gemFireProps.put(JMX_MANAGER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
+ gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
+ gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
+ gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
try{
DistributionConfigImpl config = new DistributionConfigImpl( gemFireProps );
}catch(IllegalArgumentException e){
@@ -360,6 +357,7 @@ public class SSLConfigJUnitTest {
gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
+ gemFireProps.put(JMX_MANAGER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
[31/33] incubator-geode git commit: GEODE-420: Initial Alias
defintion and removal of deprecated SSL-ENABLED properties
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index a26de3f..2c74d42 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -58,7 +58,6 @@ public interface DistributionConfig extends Config, LogConfig {
* If set it must be unique in the ds.
* When set its used by tools to help identify the member.
* <p> The default value is: {@link #DEFAULT_NAME}.
- *
* @return the system's name.
*/
@ConfigAttributeGetter(name = NAME)
@@ -67,11 +66,10 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the member's name.
* <p> The name can not be changed while the system is running.
- *
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
@ConfigAttributeSetter(name = NAME)
void setName(String value);
@@ -288,13 +286,12 @@ public interface DistributionConfig extends Config, LogConfig {
* A locator list is optional and by default empty.
* Its used to by the system to locator other system nodes
* and to publish itself so it can be located by others.
- *
* @param value must be of the form <code>hostName[portNum]</code>.
- * Multiple elements are allowed and must be seperated by a comma.
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * Multiple elements are allowed and must be seperated by a comma.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
@ConfigAttributeSetter(name = LOCATORS)
void setLocators(String value);
@@ -336,7 +333,6 @@ public interface DistributionConfig extends Config, LogConfig {
* This is a string in the form
* bindAddress[port] and, if set, tells the distributed system to start
* a locator prior to connecting
- *
* @param value must be of the form <code>hostName[portNum]</code>
*/
@ConfigAttributeSetter(name = START_LOCATOR)
@@ -360,11 +356,10 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the system's deploy working directory.
- *
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
@ConfigAttributeSetter(name = DEPLOY_WORKING_DIR)
void setDeployWorkingDir(File value);
@@ -389,11 +384,10 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the system's user command path.
- *
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
@ConfigAttributeSetter(name = USER_COMMAND_PACKAGES)
void setUserCommandPackages(String value);
@@ -422,11 +416,10 @@ public interface DistributionConfig extends Config, LogConfig {
* Sets the system's log file.
* <p> Non-absolute log files are relative to the system directory.
* <p> The system log file can not be changed while the system is running.
- *
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
*/
@ConfigAttributeSetter(name = LOG_FILE)
@@ -815,139 +808,6 @@ public interface DistributionConfig extends Config, LogConfig {
String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
/**
- * Returns the value of the {@link ConfigurationProperties#SSL_ENABLED}
- * property.
- *
- * @deprecated as of 8.0 use {@link #getClusterSSLEnabled} instead.
- */
- @ConfigAttributeGetter(name = SSL_ENABLED)
- boolean getSSLEnabled();
-
- /**
- * The default {@link ConfigurationProperties#SSL_ENABLED} state.
- * <p> Actual value of this constant is <code>false</code>.
- *
- * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED} instead.
- */
- boolean DEFAULT_SSL_ENABLED = false;
-
- /**
- * The name of the {@link ConfigurationProperties#SSL_ENABLED} property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
- */
- @ConfigAttribute(type = Boolean.class)
- String SSL_ENABLED_NAME = SSL_ENABLED;
-
- /**
- * Sets the value of the {@link ConfigurationProperties#SSL_ENABLED}
- * property.
- *
- * @deprecated as of 8.0 use {@link #setClusterSSLEnabled} instead.
- */
- @ConfigAttributeSetter(name = SSL_ENABLED)
- void setSSLEnabled(boolean enabled);
-
- /**
- * Returns the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
- * property.
- *
- * @deprecated as of 8.0 use {@link #getClusterSSLProtocols} instead.
- */
- @ConfigAttributeGetter(name = SSL_PROTOCOLS)
- String getSSLProtocols();
-
- /**
- * Sets the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
- * property.
- *
- * @deprecated as of 8.0 use {@link #setClusterSSLProtocols} instead.
- */
- @ConfigAttributeSetter(name = SSL_PROTOCOLS)
- void setSSLProtocols(String protocols);
-
- /**
- * The default {@link ConfigurationProperties#SSL_PROTOCOLS} value.
- * <p> Actual value of this constant is <code>any</code>.
- *
- * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS} instead.
- */
- String DEFAULT_SSL_PROTOCOLS = "any";
- /**
- * The name of the {@link ConfigurationProperties#SSL_PROTOCOLS} property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
- */
- @ConfigAttribute(type = String.class)
- String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
-
- /**
- * Returns the value of the {@link ConfigurationProperties#SSL_CIPHERS}
- * property.
- *
- * @deprecated as of 8.0 use {@link #getClusterSSLCiphers} instead.
- */
- @ConfigAttributeGetter(name = SSL_CIPHERS)
- String getSSLCiphers();
-
- /**
- * Sets the value of the {@link ConfigurationProperties#SSL_CIPHERS}
- * property.
- *
- * @deprecated as of 8.0 use {@link #setClusterSSLCiphers} instead.
- */
- @ConfigAttributeSetter(name = SSL_CIPHERS)
- void setSSLCiphers(String ciphers);
-
- /**
- * The default {@link ConfigurationProperties#SSL_CIPHERS} value.
- * <p> Actual value of this constant is <code>any</code>.
- *
- * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} instead.
- */
- String DEFAULT_SSL_CIPHERS = "any";
- /**
- * The name of the {@link ConfigurationProperties#SSL_CIPHERS} property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
- */
- @ConfigAttribute(type = String.class)
- String SSL_CIPHERS_NAME = SSL_CIPHERS;
-
- /**
- * Returns the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
- * property.
- *
- * @deprecated as of 8.0 use {@link #getClusterSSLRequireAuthentication} instead.
- */
- @ConfigAttributeGetter(name = SSL_REQUIRE_AUTHENTICATION)
- boolean getSSLRequireAuthentication();
-
- /**
- * Sets the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
- * property.
- *
- * @deprecated as of 8.0 use {@link #setClusterSSLRequireAuthentication} instead.
- */
- @ConfigAttributeSetter(name = SSL_REQUIRE_AUTHENTICATION)
- void setSSLRequireAuthentication(boolean enabled);
-
- /**
- * The default {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION} value.
- * <p> Actual value of this constant is <code>true</code>.
- *
- * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
- */
- boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
- /**
- * The name of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION} property
- *
- * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME} instead.
- */
- @ConfigAttribute(type = Boolean.class)
- String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
-
- /**
* Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED}
* property.
*/
@@ -1181,7 +1041,6 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of an internal property that specifies a {@link
* com.gemstone.gemfire.i18n.LogWriterI18n} instance to log to.
* Set this property with put(), not with setProperty()
- *
* @since GemFire 4.0
*/
String LOG_WRITER_NAME = "log-writer";
@@ -1191,7 +1050,6 @@ public interface DistributionConfig extends Config, LogConfig {
* a DistributionConfigImpl that the locator is passing
* in to a ds connect.
* Set this property with put(), not with setProperty()
- *
* @since GemFire 7.0
*/
String DS_CONFIG_NAME = "ds-config";
@@ -1200,7 +1058,6 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of an internal property that specifies whether
* the distributed system is reconnecting after a forced-
* disconnect.
- *
* @since GemFire 8.1
*/
String DS_RECONNECTING_NAME = "ds-reconnecting";
@@ -1217,7 +1074,6 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of an internal property that specifies a {@link
* com.gemstone.gemfire.LogWriter} instance to log security messages to. Set
* this property with put(), not with setProperty()
- *
* @since GemFire 5.5
*/
String SECURITY_LOG_WRITER_NAME = "security-log-writer";
@@ -1229,7 +1085,6 @@ public interface DistributionConfig extends Config, LogConfig {
* FileOutputStream will be closed when the distributed
* system disconnects. Set this property with put(), not
* with setProperty()
- *
* @since GemFire 5.0
*/
String LOG_OUTPUTSTREAM_NAME = "log-output-stream";
@@ -1239,7 +1094,6 @@ public interface DistributionConfig extends Config, LogConfig {
* associated with the internal property SECURITY_LOG_WRITER_NAME. If this
* property is set, the FileOutputStream will be closed when the distributed
* system disconnects. Set this property with put(), not with setProperty()
- *
* @since GemFire 5.5
*/
String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
@@ -1409,7 +1263,7 @@ public interface DistributionConfig extends Config, LogConfig {
* The default value of the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} property
*/
FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
- = new FlowControlParams(1048576, (float) 0.25, 5000);
+ = new FlowControlParams(1048576, (float) 0.25, 5000);
/**
* The minimum byteAllowance for the{@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
@@ -1970,7 +1824,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#CONFLATE_EVENTS}
* property.
- *
* @since GemFire 5.7
*/
@ConfigAttributeGetter(name = CONFLATE_EVENTS)
@@ -1979,7 +1832,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#CONFLATE_EVENTS}
* property.
- *
* @since GemFire 5.7
*/
@ConfigAttributeSetter(name = CONFLATE_EVENTS)
@@ -2256,11 +2108,10 @@ public interface DistributionConfig extends Config, LogConfig {
* Non-absolute log files are relative to the system directory.
* <p>
* The security log file can not be changed while the system is running.
- *
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error when writing to
- * the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error when writing to
+ * the system's configuration file.
*/
@ConfigAttributeSetter(name = SECURITY_LOG_FILE)
void setSecurityLogFile(File value);
@@ -2283,7 +2134,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Get timeout for peer membership check when security is enabled.
- *
* @return Timeout in milliseconds.
*/
@ConfigAttributeGetter(name = SECURITY_PEER_VERIFY_MEMBER_TIMEOUT)
@@ -2292,7 +2142,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set timeout for peer membership check when security is enabled. The timeout must be less
* than peer handshake timeout.
- *
* @param attValue
*/
@ConfigAttributeSetter(name = SECURITY_PEER_VERIFY_MEMBER_TIMEOUT)
@@ -2340,6 +2189,13 @@ public interface DistributionConfig extends Config, LogConfig {
String GEMFIRE_PREFIX = "gemfire.";
/**
+ * The static String definition of the cluster ssl prefix <i>"cluster-ssl"</i> used in conjunction with other <i>cluster-ssl-*</i> properties property
+ * <a name="cluster-ssl"/a></p>
+ * <U>Description</U>: The cluster-ssl property prefix
+ */
+ String CLUSTER_SSL_PREFIX = "cluster-ssl";
+
+ /**
* For the "custom-" prefixed properties
*/
String USERDEFINED_PREFIX_NAME = "custom-";
@@ -2378,7 +2234,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#REMOVE_UNRESPONSIVE_CLIENT}
* property.
- *
* @since GemFire 6.0
*/
@ConfigAttributeGetter(name = REMOVE_UNRESPONSIVE_CLIENT)
@@ -2387,7 +2242,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#REMOVE_UNRESPONSIVE_CLIENT}
* property.
- *
* @since GemFire 6.0
*/
@ConfigAttributeSetter(name = REMOVE_UNRESPONSIVE_CLIENT)
@@ -2404,7 +2258,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#DELTA_PROPAGATION}
* property.
- *
* @since GemFire 6.3
*/
@ConfigAttributeGetter(name = DELTA_PROPAGATION)
@@ -2413,7 +2266,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#DELTA_PROPAGATION}
* property.
- *
* @since GemFire 6.3
*/
@ConfigAttributeSetter(name = DELTA_PROPAGATION)
@@ -2473,6 +2325,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* @since GemFire 8.0
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
*/
Properties getJmxSSLProperties();
@@ -2498,7 +2351,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GROUPS} property
* <p> The default value is: {@link #DEFAULT_GROUPS}.
- *
* @return the value of the property
* @since GemFire 7.0
*/
@@ -2508,11 +2360,10 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the {@link ConfigurationProperties#GROUPS} property.
* <p> The groups can not be changed while the system is running.
- *
- * @throws IllegalArgumentException if the specified value is not acceptable.
+ * @throws IllegalArgumentException if the specified value is not acceptable.
* @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
- * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
- * when writing to the system's configuration file.
+ * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+ * when writing to the system's configuration file.
* @since GemFire 7.0
*/
@ConfigAttributeSetter(name = GROUPS)
@@ -2528,7 +2379,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GROUPS}.
* <p> Actual value of this constant is <code>""</code>.
- *
* @since GemFire 7.0
*/
String DEFAULT_GROUPS = "";
@@ -2586,31 +2436,9 @@ public interface DistributionConfig extends Config, LogConfig {
int DEFAULT_JMX_MANAGER_PORT = 1099;
/**
- * @deprecated as of 8.0 use {@link #getJmxManagerSSLEnabled} instead.
- */
- @ConfigAttributeGetter(name = JMX_MANAGER_SSL)
- boolean getJmxManagerSSL();
-
- /**
- * @deprecated as of 8.0 use {@link #setJmxManagerSSLEnabled} instead.
- */
- @ConfigAttributeSetter(name = JMX_MANAGER_SSL)
- void setJmxManagerSSL(boolean value);
-
- /**
- * @deprecated as of 8.0 use {@link #JMX_MANAGER_SSL_ENABLED_NAME} instead.
- */
- @ConfigAttribute(type = Boolean.class)
- String JMX_MANAGER_SSL_NAME = JMX_MANAGER_SSL;
-
- /**
- * @deprecated as of 8.0 use {@link #DEFAULT_JMX_MANAGER_SSL_ENABLED} instead.
- */
- boolean DEFAULT_JMX_MANAGER_SSL = false;
-
- /**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_ENABLED)
boolean getJmxManagerSSLEnabled();
@@ -2618,11 +2446,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} state.
* <p> Actual value of this constant is <code>false</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
boolean DEFAULT_JMX_MANAGER_SSL_ENABLED = false;
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
@ConfigAttribute(type = Boolean.class)
String JMX_MANAGER_SSL_ENABLED_NAME = JMX_MANAGER_SSL_ENABLED;
@@ -2630,6 +2460,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_ENABLED)
void setJmxManagerSSLEnabled(boolean enabled);
@@ -2637,7 +2468,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE}
* property.
- *
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = OFF_HEAP_MEMORY_SIZE)
@@ -2646,7 +2476,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE}
* property.
- *
* @since Geode 1.0
*/
@ConfigAttributeSetter(name = OFF_HEAP_MEMORY_SIZE)
@@ -2662,7 +2491,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE}
* value of <code>""</code>.
- *
* @since Geode 1.0
*/
String DEFAULT_OFF_HEAP_MEMORY_SIZE = "";
@@ -2670,6 +2498,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_PROTOCOLS)
String getJmxManagerSSLProtocols();
@@ -2677,6 +2506,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_PROTOCOLS)
void setJmxManagerSSLProtocols(String protocols);
@@ -2684,10 +2514,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
*/
String DEFAULT_JMX_MANAGER_SSL_PROTOCOLS = "any";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_PROTOCOLS_NAME = JMX_MANAGER_SSL_PROTOCOLS;
@@ -2695,6 +2528,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_CIPHERS)
String getJmxManagerSSLCiphers();
@@ -2702,6 +2536,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_CIPHERS)
void setJmxManagerSSLCiphers(String ciphers);
@@ -2709,10 +2544,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}
*/
String DEFAULT_JMX_MANAGER_SSL_CIPHERS = "any";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_CIPHERS_NAME = JMX_MANAGER_SSL_CIPHERS;
@@ -2720,6 +2558,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION)
boolean getJmxManagerSSLRequireAuthentication();
@@ -2727,6 +2566,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION)
void setJmxManagerSSLRequireAuthentication(boolean enabled);
@@ -2734,10 +2574,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} value.
* <p> Actual value of this constant is <code>true</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
boolean DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = true;
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@ConfigAttribute(type = Boolean.class)
String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
@@ -2745,6 +2588,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE)
String getJmxManagerSSLKeyStore();
@@ -2752,6 +2596,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE)
void setJmxManagerSSLKeyStore(String keyStore);
@@ -2759,11 +2604,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
String DEFAULT_JMX_MANAGER_SSL_KEYSTORE = "";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_KEYSTORE_NAME = JMX_MANAGER_SSL_KEYSTORE;
@@ -2771,6 +2619,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE_TYPE)
String getJmxManagerSSLKeyStoreType();
@@ -2778,6 +2627,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE_TYPE)
void setJmxManagerSSLKeyStoreType(String keyStoreType);
@@ -2785,11 +2635,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_TYPE = "";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME = JMX_MANAGER_SSL_KEYSTORE_TYPE;
@@ -2797,6 +2650,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE_PASSWORD)
String getJmxManagerSSLKeyStorePassword();
@@ -2804,6 +2658,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE_PASSWORD)
void setJmxManagerSSLKeyStorePassword(String keyStorePassword);
@@ -2811,11 +2666,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} propery
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME = JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
@@ -2823,6 +2681,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_TRUSTSTORE)
String getJmxManagerSSLTrustStore();
@@ -2830,6 +2689,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_TRUSTSTORE)
void setJmxManagerSSLTrustStore(String trustStore);
@@ -2837,11 +2697,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
*/
String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE = "";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_TRUSTSTORE_NAME = JMX_MANAGER_SSL_TRUSTSTORE;
@@ -2849,6 +2712,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@ConfigAttributeGetter(name = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)
String getJmxManagerSSLTrustStorePassword();
@@ -2856,6 +2720,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@ConfigAttributeSetter(name = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)
void setJmxManagerSSLTrustStorePassword(String trusStorePassword);
@@ -2863,11 +2728,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
@@ -2915,6 +2783,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
* @deprecated as of 8.0 use {@link #getHttpServicePort()} instead.
*/
@ConfigAttributeGetter(name = JMX_MANAGER_HTTP_PORT)
@@ -2923,6 +2792,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for jmx-manager.
*
+ * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for jmx-manager.
* @param value the port number for jmx-manager HTTP service
* @deprecated as of 8.0 use {@link #setHttpServicePort(int)} instead.
*/
@@ -2932,6 +2802,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
*
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
* @deprecated as of 8.0 use {{@link #HTTP_SERVICE_PORT_NAME} instead.
*/
@ConfigAttribute(type = Integer.class, min = 0, max = 65535)
@@ -2940,7 +2811,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
* Current value is a <code>7070</code>
- *
* @deprecated as of 8.0 use {@link #DEFAULT_HTTP_SERVICE_PORT} instead.
*/
int DEFAULT_JMX_MANAGER_HTTP_PORT = 7070;
@@ -2960,6 +2830,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#MEMCACHED_PORT} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_PORT} property
* @return the port on which GemFireMemcachedServer should be started
* @since GemFire 7.0
*/
@@ -2976,6 +2847,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#MEMCACHED_PROTOCOL} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_PROTOCOL} property
* @return the protocol for GemFireMemcachedServer
* @since GemFire 7.0
*/
@@ -2992,6 +2864,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
* @return the bind address for GemFireMemcachedServer
* @since GemFire 7.0
*/
@@ -3024,6 +2897,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#REDIS_BIND_ADDRESS} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#REDIS_BIND_ADDRESS} property
* @return the bind address for GemFireRedisServer
* @since GemFire 8.0
*/
@@ -3040,6 +2914,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#REDIS_PASSWORD} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#REDIS_PASSWORD} property
* @return the authentication password for GemFireRedisServer
* @since GemFire 8.0
*/
@@ -3058,6 +2933,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
* @return the HTTP service port
* @since GemFire 8.0
*/
@@ -3067,6 +2943,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set the {@link ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP service.
*
+ * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP service.
* @param value the port number for HTTP service
* @since GemFire 8.0
*/
@@ -3076,6 +2953,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property
*
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
* @since GemFire 8.0
*/
@ConfigAttribute(type = Integer.class, min = 0, max = 65535)
@@ -3084,7 +2962,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property.
* Current value is a <code>7070</code>
- *
* @since GemFire 8.0
*/
int DEFAULT_HTTP_SERVICE_PORT = 7070;
@@ -3092,6 +2969,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
* @return the bind-address for HTTP service
* @since GemFire 8.0
*/
@@ -3101,6 +2979,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} for HTTP service.
*
+ * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} for HTTP service.
* @param value the bind-address for HTTP service
* @since GemFire 8.0
*/
@@ -3118,7 +2997,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property.
* Current value is an empty string <code>""</code>
- *
* @since GemFire 8.0
*/
String DEFAULT_HTTP_SERVICE_BIND_ADDRESS = "";
@@ -3128,6 +3006,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_ENABLED)
boolean getHttpServiceSSLEnabled();
@@ -3135,6 +3014,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_ENABLED)
void setHttpServiceSSLEnabled(boolean httpServiceSSLEnabled);
@@ -3142,11 +3022,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} state.
* <p> Actual value of this constant is <code>false</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
boolean DEFAULT_HTTP_SERVICE_SSL_ENABLED = false;
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
@ConfigAttribute(type = Boolean.class)
String HTTP_SERVICE_SSL_ENABLED_NAME = HTTP_SERVICE_SSL_ENABLED;
@@ -3154,6 +3037,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION)
boolean getHttpServiceSSLRequireAuthentication();
@@ -3161,6 +3045,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION)
void setHttpServiceSSLRequireAuthentication(boolean httpServiceSSLRequireAuthentication);
@@ -3168,11 +3053,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} value.
* <p> Actual value of this constant is <code>true</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
boolean DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = false;
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@ConfigAttribute(type = Boolean.class)
String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
@@ -3180,6 +3068,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_PROTOCOLS)
String getHttpServiceSSLProtocols();
@@ -3187,6 +3076,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_PROTOCOLS)
void setHttpServiceSSLProtocols(String protocols);
@@ -3194,11 +3084,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
*/
String DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS = "any";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_PROTOCOLS_NAME = HTTP_SERVICE_SSL_PROTOCOLS;
@@ -3206,6 +3099,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_CIPHERS)
String getHttpServiceSSLCiphers();
@@ -3213,6 +3107,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_CIPHERS)
void setHttpServiceSSLCiphers(String ciphers);
@@ -3220,11 +3115,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}
*/
String DEFAULT_HTTP_SERVICE_SSL_CIPHERS = "any";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_CIPHERS_NAME = HTTP_SERVICE_SSL_CIPHERS;
@@ -3232,6 +3130,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE)
String getHttpServiceSSLKeyStore();
@@ -3239,6 +3138,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE)
void setHttpServiceSSLKeyStore(String keyStore);
@@ -3246,11 +3146,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE
*/
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE = "";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_KEYSTORE_NAME = HTTP_SERVICE_SSL_KEYSTORE;
@@ -3258,6 +3161,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD)
String getHttpServiceSSLKeyStorePassword();
@@ -3265,6 +3169,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD)
void setHttpServiceSSLKeyStorePassword(String keyStorePassword);
@@ -3272,11 +3177,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
@@ -3284,6 +3192,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE_TYPE)
String getHttpServiceSSLKeyStoreType();
@@ -3291,6 +3200,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE_TYPE)
void setHttpServiceSSLKeyStoreType(String keyStoreType);
@@ -3298,11 +3208,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_TYPE = "";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME = HTTP_SERVICE_SSL_KEYSTORE_TYPE;
@@ -3310,6 +3223,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_TRUSTSTORE)
String getHttpServiceSSLTrustStore();
@@ -3317,6 +3231,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_TRUSTSTORE)
void setHttpServiceSSLTrustStore(String trustStore);
@@ -3324,11 +3239,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
*/
String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE = "";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_TRUSTSTORE_NAME = HTTP_SERVICE_SSL_TRUSTSTORE;
@@ -3336,6 +3254,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@ConfigAttributeGetter(name = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD)
String getHttpServiceSSLTrustStorePassword();
@@ -3343,6 +3262,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@ConfigAttributeSetter(name = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD)
void setHttpServiceSSLTrustStorePassword(String trustStorePassword);
@@ -3350,15 +3270,21 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
+ /**
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
+ */
Properties getHttpServiceSSLProperties();
//Added for API REST
@@ -3366,6 +3292,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#START_DEV_REST_API} property
*
+ * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} property
* @return the value of the property
* @since GemFire 8.0
*/
@@ -3375,6 +3302,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Set the {@link ConfigurationProperties#START_DEV_REST_API} for HTTP service.
*
+ * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} for HTTP service.
* @param value for the property
* @since GemFire 8.0
*/
@@ -3384,6 +3312,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The name of the {@link ConfigurationProperties#START_DEV_REST_API} property
*
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} property
* @since GemFire 8.0
*/
@ConfigAttribute(type = Boolean.class)
@@ -3392,7 +3321,6 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default value of the {@link ConfigurationProperties#START_DEV_REST_API} property.
* Current value is <code>"false"</code>
- *
* @since GemFire 8.0
*/
boolean DEFAULT_START_DEV_REST_API = false;
@@ -3424,11 +3352,15 @@ public interface DistributionConfig extends Config, LogConfig {
@ConfigAttributeSetter(name = DISABLE_AUTO_RECONNECT)
void setDisableAutoReconnect(boolean value);
+ /**
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
+ */
Properties getServerSSLProperties();
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_ENABLED)
boolean getServerSSLEnabled();
@@ -3436,10 +3368,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_ENABLED} state.
* <p> Actual value of this constant is <code>false</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
boolean DEFAULT_SERVER_SSL_ENABLED = false;
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_ENABLED} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_ENABLED} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_ENABLED}
*/
@ConfigAttribute(type = Boolean.class)
String SERVER_SSL_ENABLED_NAME = SERVER_SSL_ENABLED;
@@ -3447,6 +3382,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
*/
@ConfigAttributeSetter(name = SERVER_SSL_ENABLED)
void setServerSSLEnabled(boolean enabled);
@@ -3454,6 +3390,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_PROTOCOLS)
String getServerSSLProtocols();
@@ -3468,10 +3405,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
*/
String DEFAULT_SERVER_SSL_PROTOCOLS = "any";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_PROTOCOLS_NAME = SERVER_SSL_PROTOCOLS;
@@ -3479,6 +3419,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}�
*/
@ConfigAttributeGetter(name = SERVER_SSL_CIPHERS)
String getServerSSLCiphers();
@@ -3486,6 +3427,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}�
*/
@ConfigAttributeSetter(name = SERVER_SSL_CIPHERS)
void setServerSSLCiphers(String ciphers);
@@ -3493,10 +3435,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_CIPHERS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}�
*/
String DEFAULT_SERVER_SSL_CIPHERS = "any";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_CIPHERS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}�
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_CIPHERS_NAME = SERVER_SSL_CIPHERS;
@@ -3504,6 +3449,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}�
*/
@ConfigAttributeGetter(name = SERVER_SSL_REQUIRE_AUTHENTICATION)
boolean getServerSSLRequireAuthentication();
@@ -3511,6 +3457,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}�
*/
@ConfigAttributeSetter(name = SERVER_SSL_REQUIRE_AUTHENTICATION)
void setServerSSLRequireAuthentication(boolean enabled);
@@ -3518,10 +3465,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} value.
* <p> Actual value of this constant is <code>true</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
boolean DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION = true;
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@ConfigAttribute(type = Boolean.class)
String SERVER_SSL_REQUIRE_AUTHENTICATION_NAME = SERVER_SSL_REQUIRE_AUTHENTICATION;
@@ -3529,6 +3479,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE)
String getServerSSLKeyStore();
@@ -3536,6 +3487,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@ConfigAttributeSetter(name = SERVER_SSL_KEYSTORE)
void setServerSSLKeyStore(String keyStore);
@@ -3543,11 +3495,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
String DEFAULT_SERVER_SSL_KEYSTORE = "";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_KEYSTORE_NAME = SERVER_SSL_KEYSTORE;
@@ -3555,6 +3510,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE_TYPE)
String getServerSSLKeyStoreType();
@@ -3569,11 +3525,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
String DEFAULT_SERVER_SSL_KEYSTORE_TYPE = "";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_KEYSTORE_TYPE_NAME = SERVER_SSL_KEYSTORE_TYPE;
@@ -3581,6 +3540,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE_PASSWORD)
String getServerSSLKeyStorePassword();
@@ -3595,11 +3555,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_KEYSTORE_PASSWORD_NAME = SERVER_SSL_KEYSTORE_PASSWORD;
@@ -3607,6 +3570,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_TRUSTSTORE)
String getServerSSLTrustStore();
@@ -3614,6 +3578,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setServerSSLTrustStore(String)}
*/
@ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE)
void setServerSSLTrustStore(String trustStore);
@@ -3621,11 +3586,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
*/
String DEFAULT_SERVER_SSL_TRUSTSTORE = "";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_TRUSTSTORE_NAME = SERVER_SSL_TRUSTSTORE;
@@ -3633,6 +3601,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@ConfigAttributeGetter(name = SERVER_SSL_TRUSTSTORE_PASSWORD)
String getServerSSLTrustStorePassword();
@@ -3640,6 +3609,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE_PASSWORD)
void setServerSSLTrustStorePassword(String trusStorePassword);
@@ -3647,11 +3617,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String SERVER_SSL_TRUSTSTORE_PASSWORD_NAME = SERVER_SSL_TRUSTSTORE_PASSWORD;
@@ -3659,6 +3632,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_ENABLED)
boolean getGatewaySSLEnabled();
@@ -3666,10 +3640,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} state.
* <p> Actual value of this constant is <code>false</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
*/
boolean DEFAULT_GATEWAY_SSL_ENABLED = false;
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_ENABLED} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
*/
@ConfigAttribute(type = Boolean.class)
String GATEWAY_SSL_ENABLED_NAME = GATEWAY_SSL_ENABLED;
@@ -3677,6 +3654,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_ENABLED)
void setGatewaySSLEnabled(boolean enabled);
@@ -3684,6 +3662,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_PROTOCOLS)
String getGatewaySSLProtocols();
@@ -3691,6 +3670,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_PROTOCOLS)
void setGatewaySSLProtocols(String protocols);
@@ -3698,10 +3678,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
*/
String DEFAULT_GATEWAY_SSL_PROTOCOLS = "any";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_PROTOCOLS_NAME = GATEWAY_SSL_PROTOCOLS;
@@ -3709,6 +3692,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}�
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_CIPHERS)
String getGatewaySSLCiphers();
@@ -3716,6 +3700,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}�
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_CIPHERS)
void setGatewaySSLCiphers(String ciphers);
@@ -3723,10 +3708,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} value.
* <p> Actual value of this constant is <code>any</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}�
*/
String DEFAULT_GATEWAY_SSL_CIPHERS = "any";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_CIPHERS} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}�
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_CIPHERS_NAME = GATEWAY_SSL_CIPHERS;
@@ -3734,6 +3722,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
boolean getGatewaySSLRequireAuthentication();
@@ -3741,6 +3730,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
* property.
+ * @deprecated Geode 1.0 use {@link #setGatewaySSLRequireAuthentication(boolean)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
void setGatewaySSLRequireAuthentication(boolean enabled);
@@ -3748,10 +3738,13 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} value.
* <p> Actual value of this constant is <code>true</code>.
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
boolean DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION = true;
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
@ConfigAttribute(type = Boolean.class)
String GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME = GATEWAY_SSL_REQUIRE_AUTHENTICATION;
@@ -3759,6 +3752,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE)
String getGatewaySSLKeyStore();
@@ -3766,6 +3760,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE)
void setGatewaySSLKeyStore(String keyStore);
@@ -3773,11 +3768,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
*/
String DEFAULT_GATEWAY_SSL_KEYSTORE = "";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_KEYSTORE_NAME = GATEWAY_SSL_KEYSTORE;
@@ -3792,6 +3790,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE_TYPE)
void setGatewaySSLKeyStoreType(String keyStoreType);
@@ -3799,11 +3798,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
*/
String DEFAULT_GATEWAY_SSL_KEYSTORE_TYPE = "";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_KEYSTORE_TYPE_NAME = GATEWAY_SSL_KEYSTORE_TYPE;
@@ -3811,6 +3813,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE_PASSWORD)
String getGatewaySSLKeyStorePassword();
@@ -3818,6 +3821,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE_PASSWORD)
void setGatewaySSLKeyStorePassword(String keyStorePassword);
@@ -3825,11 +3829,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_KEYSTORE_PASSWORD_NAME = GATEWAY_SSL_KEYSTORE_PASSWORD;
@@ -3837,6 +3844,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_TRUSTSTORE)
String getGatewaySSLTrustStore();
@@ -3844,6 +3852,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_TRUSTSTORE)
void setGatewaySSLTrustStore(String trustStore);
@@ -3851,11 +3860,14 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
*/
String DEFAULT_GATEWAY_SSL_TRUSTSTORE = "";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_TRUSTSTORE_NAME = GATEWAY_SSL_TRUSTSTORE;
@@ -3863,6 +3875,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
*/
@ConfigAttributeGetter(name = GATEWAY_SSL_TRUSTSTORE_PASSWORD)
String getGatewaySSLTrustStorePassword();
@@ -3870,6 +3883,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD}
* property.
+ * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
*/
@ConfigAttributeSetter(name = GATEWAY_SSL_TRUSTSTORE_PASSWORD)
void setGatewaySSLTrustStorePassword(String trusStorePassword);
@@ -3877,15 +3891,21 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* The default {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} value.
* <p> Actual value of this constant is "".
+ * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD = "";
/**
* The name of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} property
+ * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} property
+ * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
@ConfigAttribute(type = String.class)
String GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME = GATEWAY_SSL_TRUSTSTORE_PASSWORD;
+ /**
+ * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
+ */
Properties getGatewaySSLProperties();
ConfigSource getConfigSource(String attName);
@@ -3894,7 +3914,6 @@ public interface DistributionConfig extends Config, LogConfig {
* The name of the {@link ConfigurationProperties#LOCK_MEMORY} property. Used to cause
* pages to be locked
* into memory, thereby preventing them from being swapped to disk.
- *
* @since Geode 1.0
*/
@ConfigAttribute(type = Boolean.class)
@@ -3904,6 +3923,7 @@ public interface DistributionConfig extends Config, LogConfig {
/**
* Gets the value of {@link ConfigurationProperties#LOCK_MEMORY}
*
+ * Gets the value of {@link com.gemstone.gemfire.distributed.ConfigurationProperties#LOCK_MEMORY}
* @since Geode 1.0
*/
@ConfigAttributeGetter(name = LOCK_MEMORY)
@@ -3927,6 +3947,109 @@ public interface DistributionConfig extends Config, LogConfig {
@ConfigAttributeGetter(name = SECURITY_SHIRO_INIT)
String getShiroInit();
+
+ /**
+ * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeGetter(name = CLUSTER_SSL_ALIAS)
+ String getClusterSSLAlias();
+
+ /**
+ * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeSetter(name = CLUSTER_SSL_ALIAS)
+ void setClusterSSLAlias(String alias);
+
+ String DEFAULT_CLUSTER_SSL_ALIAS = "";
+
+ /**
+ * The name of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS} property
+ */
+ @ConfigAttribute(type = String.class)
+ String CLUSTER_SSL_ALIAS_NAME = CLUSTER_SSL_ALIAS;
+
+ /**
+ * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeGetter(name = GATEWAY_SSL_ALIAS)
+ String getGatewaySSLAlias();
+
+ /**
+ * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeSetter(name = GATEWAY_SSL_ALIAS)
+ void setGatewaySSLAlias(String alias);
+
+ /**
+ * The name of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS} property
+ */
+ @ConfigAttribute(type = String.class)
+ String GATEWAY_SSL_ALIAS_NAME = GATEWAY_SSL_ALIAS;
+
+ /**
+ * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_ALIAS)
+ String getHTTPServiceSSLAlias();
+
+ /**
+ * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_ALIAS)
+ void setHTTPServiceSSLAlias(String alias);
+
+ /**
+ * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ALIAS} property
+ */
+ @ConfigAttribute(type = String.class)
+ String HTTP_SERVICE_SSL_ALIAS_NAME = HTTP_SERVICE_SSL_ALIAS;
+
+ /**
+ * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeGetter(name = JMX_MANAGER_SSL_ALIAS)
+ String getJMXManagerSSLAlias();
+
+ /**
+ * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeSetter(name = JMX_MANAGER_SSL_ALIAS)
+ void setJMXManagerSSLAlias(String alias);
+
+ /**
+ * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS} property
+ */
+ @ConfigAttribute(type = String.class)
+ String JMX_MANAGER_SSL_ALIAS_NAME = JMX_MANAGER_SSL_ALIAS;
+
+ /**
+ * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeGetter(name = SERVER_SSL_ALIAS)
+ String getServerSSLAlias();
+
+ /**
+ * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_ALIAS}
+ * property.
+ */
+ @ConfigAttributeSetter(name = SERVER_SSL_ALIAS)
+ void setServerSSLAlias(String alias);
+
+ /**
+ * The name of the {@link ConfigurationProperties#SERVER_SSL_ALIAS} property
+ */
+ @ConfigAttribute(type = String.class)
+ String SERVER_SSL_ALIAS_NAME = SERVER_SSL_ALIAS;
+
//*************** Initializers to gather all the annotations in this class ************************
Map<String, ConfigAttribute> attributes = new HashMap<>();
@@ -3941,7 +4064,8 @@ public interface DistributionConfig extends Config, LogConfig {
try {
atts.add((String) field.get(null));
attributes.put((String) field.get(null), field.getAnnotation(ConfigAttribute.class));
-
<TRUNCATED>
[08/33] incubator-geode git commit: Minor javadoc fixes
Posted by ud...@apache.org.
Minor javadoc fixes
GatewayCancelledException said it was thrown when an Oplog is terminated.
OplogCancelledException said it was thrown when a Gateway is terminated.
DistributedMember had a non-deprecated getRoles() method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5e0050de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5e0050de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5e0050de
Branch: refs/heads/feature/GEODE-420
Commit: 5e0050de149fb1540c5dcf45257e5283cf3ff9f9
Parents: e831aa0
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Jun 10 15:55:17 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Jun 10 15:55:17 2016 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/distributed/DistributedMember.java | 1 +
.../gemstone/gemfire/distributed/GatewayCancelledException.java | 2 +-
.../com/gemstone/gemfire/distributed/OplogCancelledException.java | 2 +-
.../com/gemstone/gemfire/distributed/PoolCancelledException.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5e0050de/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
index 3779cdc..58c5094 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
@@ -44,6 +44,7 @@ public interface DistributedMember extends Comparable<DistributedMember> {
/**
* Returns the Roles that this member performs in the system.
* Note that the result will contain both groups and roles.
+ * @deprecated Roles is scheduled to be removed
*/
public Set<Role> getRoles();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5e0050de/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
index bfe25a1..11d975f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.distributed;
import com.gemstone.gemfire.CancelException;
/**
- * Thrown when a GemFire oplog has been terminated.
+ * Thrown when a GemFire WAN gateway has been terminated.
*
* @since GemFire 6.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5e0050de/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
index aa43f24..fa7cb58 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.distributed;
import com.gemstone.gemfire.CancelException;
/**
- * Thrown when a GemFire gateway has been terminated.
+ * Thrown when a GemFire operation log has been terminated.
*
* @since GemFire 6.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5e0050de/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
index 9eed2b7..4cbd994 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.distributed;
import com.gemstone.gemfire.CancelException;
/**
- * Thrown when a GemFire pool has been cancelled.
+ * Thrown when a GemFire connection pool has been terminated.
*
* @since GemFire 6.0
*/
[03/33] incubator-geode git commit: GEODE-1416: rename profiles to be
Apache Geode
Posted by ud...@apache.org.
GEODE-1416: rename profiles to be Apache Geode
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/36184d55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/36184d55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/36184d55
Branch: refs/heads/feature/GEODE-420
Commit: 36184d5596f83dc9a9fbfd3a6eb9bddbad12aa18
Parents: 94a4b4a
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu Jun 9 15:53:08 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jun 9 15:53:08 2016 -0700
----------------------------------------------------------------------
etc/eclipseFormatterProfile.xml | 2 +-
etc/intellijIdeaCodeStyle.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36184d55/etc/eclipseFormatterProfile.xml
----------------------------------------------------------------------
diff --git a/etc/eclipseFormatterProfile.xml b/etc/eclipseFormatterProfile.xml
index aa83bdb..ead2f39 100755
--- a/etc/eclipseFormatterProfile.xml
+++ b/etc/eclipseFormatterProfile.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Geode" version="12">
+<profile kind="CodeFormatterProfile" name="Apache Geode" version="12">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36184d55/etc/intellijIdeaCodeStyle.xml
----------------------------------------------------------------------
diff --git a/etc/intellijIdeaCodeStyle.xml b/etc/intellijIdeaCodeStyle.xml
index 0c3a6d70..65d6a31 100755
--- a/etc/intellijIdeaCodeStyle.xml
+++ b/etc/intellijIdeaCodeStyle.xml
@@ -1,4 +1,4 @@
-<code_scheme name="geodeCodeStyleScheme">
+<code_scheme name="Apache Geode">
<option name="OTHER_INDENT_OPTIONS">
<value>
<option name="INDENT_SIZE" value="2" />
[05/33] incubator-geode git commit: GEODE-1377: Fixing spark build
issue due to rename of ConfigurationProperties
Posted by ud...@apache.org.
GEODE-1377: Fixing spark build issue due to rename of ConfigurationProperties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f8dd6cee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f8dd6cee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f8dd6cee
Branch: refs/heads/feature/GEODE-420
Commit: f8dd6ceea620c865c8bd5c5b5a018b6aa41a8a1e
Parents: 1f74453
Author: Jason Huynh <hu...@gmail.com>
Authored: Fri Jun 10 08:08:41 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Fri Jun 10 08:08:41 2016 -0700
----------------------------------------------------------------------
.../io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8dd6cee/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java b/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java
index 1bae89b..cd326f8 100644
--- a/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java
+++ b/geode-spark-connector/geode-spark-connector/src/it/java/ittest/io/pivotal/geode/spark/connector/JavaApiIntegrationTest.java
@@ -17,7 +17,7 @@
package ittest.io.pivotal.geode.spark.connector;
import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
import io.pivotal.geode.spark.connector.GeodeConnection;
import io.pivotal.geode.spark.connector.GeodeConnectionConf;
import io.pivotal.geode.spark.connector.GeodeConnectionConf$;
@@ -58,7 +58,7 @@ public class JavaApiIntegrationTest extends JUnitSuite {
public static void setUpBeforeClass() throws Exception {
// start geode cluster, and spark context
Properties settings = new Properties();
- settings.setProperty(DistributedSystemConfigProperties.CACHE_XML_FILE, "src/it/resources/test-retrieve-regions.xml");
+ settings.setProperty(ConfigurationProperties.CACHE_XML_FILE, "src/it/resources/test-retrieve-regions.xml");
settings.setProperty("num-of-servers", Integer.toString(numServers));
int locatorPort = GeodeCluster$.MODULE$.start(settings);
[26/33] incubator-geode git commit: GEODE-420: Fixing Tests
Posted by ud...@apache.org.
GEODE-420: Fixing Tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/57901ec6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/57901ec6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/57901ec6
Branch: refs/heads/feature/GEODE-420
Commit: 57901ec6664737bc577efa6ae1e7a0689e1680a4
Parents: 12f69be
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Jun 15 11:05:10 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 16 02:17:16 2016 +1000
----------------------------------------------------------------------
.../internal/DistributionConfig.java | 2 +
.../internal/DistributionConfigImpl.java | 8 +++-
.../gemfire/internal/AbstractConfig.java | 1 +
.../gemfire/internal/i18n/LocalizedStrings.java | 14 +++----
.../InternalDistributedSystemJUnitTest.java | 1 -
.../HTTPServiceSSLSupportJUnitTest.java | 41 ++++++++++----------
6 files changed, 38 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57901ec6/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 3cbe3f2..3fef206 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -4071,6 +4071,8 @@ public interface DistributionConfig extends Config, LogConfig {
@ConfigAttribute(type = String.class)
String SSL_ENABLED_COMPONENTS_NAME = SSL_ENABLED_COMPONENTS;
+ String DEFAULT_SSL_ENABLED_COMPONENTS = "";
+
//*************** Initializers to gather all the annotations in this class ************************
Map<String, ConfigAttribute> attributes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57901ec6/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 7ba8aee..09b5070 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
@@ -484,7 +484,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
private String httpServiceSSLAlias = clusterSSLAlias;
- private String sslEnabledComponents;
+ private String sslEnabledComponents = DEFAULT_SSL_ENABLED_COMPONENTS;
private Map<String, ConfigSource> sourceMap = Collections.synchronizedMap(new HashMap<String, ConfigSource>());
@@ -3191,6 +3191,12 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
result = prime * result + (useSharedConfiguration ? 1231 : 1237);
result = prime * result + ((userCommandPackages == null) ? 0 : userCommandPackages.hashCode());
result = prime * result + ((userDefinedProps == null) ? 0 : userDefinedProps.hashCode());
+ result = prime * result + ((clusterSSLAlias == null) ? 0 : clusterSSLAlias.hashCode());
+ result = prime * result + ((serverSSLAlias == null) ? 0 : serverSSLAlias.hashCode());
+ result = prime * result + ((jmxManagerSSLAlias == null) ? 0 : jmxManagerSSLAlias.hashCode());
+ result = prime * result + ((gatewaySSLAlias == null) ? 0 : gatewaySSLAlias.hashCode());
+ result = prime * result + ((httpServiceSSLAlias == null) ? 0 : httpServiceSSLAlias.hashCode());
+ result = prime * result + ((sslEnabledComponents == null) ? 0 : sslEnabledComponents.hashCode());
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57901ec6/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index da4209b..fae1908 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -218,6 +218,7 @@ public abstract class AbstractConfig implements Config {
if (isDeprecated(attNames[i])) {
continue;
}
+ System.out.println("attNames = " + attNames[i]);
result.setProperty(attNames[i], getAttribute(attNames[i]));
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57901ec6/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index 01b6779..3dd4b5c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -3760,15 +3760,15 @@ public class LocalizedStrings {
public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD = new StringId(6630, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with no analyzer on that field.");
public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD = new StringId(6631, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with analyzer {4} on that field.");
- public static final StringId AbstractDistributionConfig_CLUSTER_SSL_ALIAS_0 = new StringId(6632,"SSL communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
- public static final StringId AbstractDistributionConfig_GATEWAY_SSL_ALIAS_0 = new StringId(6632,"SSL gateway communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
- public static final StringId AbstractDistributionConfig_SERVER_SSL_ALIAS_0 = new StringId(6632,"SSL inter-server communication (peer-to-peer) uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
- public static final StringId AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0 = new StringId(6632,"SSL http service communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
- public static final StringId AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0 = new StringId(6632,"SSL jmx communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_CLUSTER_SSL_ALIAS_0 = new StringId(6633,"SSL communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_GATEWAY_SSL_ALIAS_0 = new StringId(6634,"SSL gateway communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_SERVER_SSL_ALIAS_0 = new StringId(6635,"SSL inter-server communication (peer-to-peer) uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0 = new StringId(6636,"SSL http service communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0 = new StringId(6637,"SSL jmx communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
- public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_0_INVALID_TRY_1 = new StringId(6633,"\"{0}\" is not in the valid set of {1}");
+ public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_0_INVALID_TRY_1 = new StringId(6638,"\"{0}\" is not in the valid set of {1}");
- public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET = new StringId(6634,"When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
+ public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET = new StringId(6639,"When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases");
/** Testing strings, messageId 90000-99999 **/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57901ec6/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index 88f0208..1117867 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -696,7 +696,6 @@ public class InternalDistributedSystemJUnitTest
// and its use in toProperties.
// The other thing that is done is the ssl-* props are copied to cluster-ssl-*.
// The following two assertions demonstrate this.
- assertEquals(null, props1.getProperty(CLUSTER_SSL_ENABLED));
assertEquals("true", props1.getProperty(CLUSTER_SSL_ENABLED));
Config config2 = new DistributionConfigImpl(props1, false);
assertEquals(true, config1.sameAs(config2));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57901ec6/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index b14a3d7..1e7ff69 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -16,21 +16,22 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-import com.gemstone.gemfire.util.test.TestUtil;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.Properties;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
/**
* @since GemFire 8.1
@@ -112,15 +113,15 @@ public class HTTPServiceSSLSupportJUnitTest {
DistributionConfigImpl config = new DistributionConfigImpl(localProps);
- assertEquals(config.getHttpServiceSSLEnabled(), true);
- assertEquals(config.getHttpServiceSSLProtocols(), "SSL");
- assertEquals(config.getHttpServiceSSLRequireAuthentication(), true);
+ assertEquals(true, config.getHttpServiceSSLEnabled());
+ assertEquals("SSL", config.getHttpServiceSSLProtocols());
+ assertEquals(true, config.getHttpServiceSSLRequireAuthentication());
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStore"), jks.getCanonicalPath());
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStorePassword"), "password");
+ assertEquals(jks.getCanonicalPath(), config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStore"));
+ assertEquals("password", config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStorePassword"));
// assertIndexDetailsEquals(system.getConfig().getHttpServiceSSLKeyStoreType(),"JKS");
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStore"), jks.getCanonicalPath());
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStorePassword"), "password");
+ assertEquals(jks.getCanonicalPath(), config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStore"));
+ assertEquals("password", config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStorePassword"));
}
@@ -148,10 +149,10 @@ public class HTTPServiceSSLSupportJUnitTest {
assertEquals(config.getHttpServiceSSLProtocols(), "SSL");
assertEquals(config.getHttpServiceSSLRequireAuthentication(), true);
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStore"), jks.getCanonicalPath());
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStorePassword"), "password");
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStore"), jks.getCanonicalPath());
- assertEquals(config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStorePassword"), "password");
+ assertEquals(jks.getCanonicalPath(), config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStore"));
+ assertEquals("password", config.getHttpServiceSSLProperties().get("javax.net.ssl.keyStorePassword"));
+ assertEquals(jks.getCanonicalPath(), config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStore"));
+ assertEquals("password", config.getHttpServiceSSLProperties().get("javax.net.ssl.trustStorePassword"));
}
[32/33] incubator-geode git commit: GEODE-420: Initial Alias
defintion and removal of deprecated SSL-ENABLED properties
Posted by ud...@apache.org.
GEODE-420: Initial Alias defintion and removal of deprecated SSL-ENABLED properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f71350a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f71350a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f71350a1
Branch: refs/heads/feature/GEODE-420
Commit: f71350a150f7ac90a6f3706bbcda97f5cecb23b1
Parents: 0f2bb8f
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Jun 14 08:41:09 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 16 02:17:16 2016 +1000
----------------------------------------------------------------------
.../gemfire/admin/DistributedSystemConfig.java | 28 -
.../internal/DistributedSystemConfigImpl.java | 24 +-
.../EnabledManagedEntityController.java | 8 +-
.../admin/jmx/internal/AgentConfigImpl.java | 501 ++--
.../jmx/internal/MX4JServerSocketFactory.java | 4 +-
.../distributed/ConfigurationProperties.java | 170 +-
.../internal/AbstractDistributionConfig.java | 39 +-
.../internal/DistributionConfig.java | 553 ++--
.../internal/DistributionConfigImpl.java | 2596 +++++++++---------
.../gemfire/internal/AbstractConfig.java | 15 +-
.../gemfire/internal/admin/SSLConfig.java | 16 +-
.../gemfire/management/GemFireProperties.java | 108 +-
.../internal/beans/BeanUtilFuncs.java | 125 +-
.../internal/cli/commands/ShellCommands.java | 6 +-
.../internal/cli/shell/JmxOperationInvoker.java | 156 +-
.../InternalDistributedSystemJUnitTest.java | 6 +-
.../internal/AbstractConfigJUnitTest.java | 1 -
.../gemfire/internal/JSSESocketJUnitTest.java | 10 +-
.../gemfire/internal/SSLConfigJUnitTest.java | 240 +-
.../management/CacheManagementDUnitTest.java | 386 +--
...ersalMembershipListenerAdapterDUnitTest.java | 16 +-
.../HTTPServiceSSLSupportJUnitTest.java | 12 +-
.../generator/SSLCredentialGenerator.java | 8 +-
23 files changed, 2405 insertions(+), 2623 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 5ef389f..17600bc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -189,34 +189,6 @@ public interface DistributedSystemConfig extends Cloneable {
String DEFAULT_REMOTE_COMMAND =
"rsh -n {HOST} {CMD}";
- /** The name of the "SSLEnabled" property */
- String SSL_ENABLED_NAME = SSL_ENABLED;
-
- /** The default ssl-enabled state (<code>false</code>) */
- boolean DEFAULT_SSL_ENABLED =
- DistributionConfig.DEFAULT_SSL_ENABLED;
-
- /** The name of the "SSLProtocols" property */
- String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
-
- /** The default ssl-protocols value (<code>any</code>) */
- String DEFAULT_SSL_PROTOCOLS =
- DistributionConfig.DEFAULT_SSL_PROTOCOLS;
-
- /** The name of the "SSLCiphers" property */
- String SSL_CIPHERS_NAME = SSL_CIPHERS;
-
- /** The default ssl-ciphers value. (<code>any</code>) */
- String DEFAULT_SSL_CIPHERS =
- DistributionConfig.DEFAULT_SSL_CIPHERS;
-
- /** The name of the "SSLRequireAuthentication" property */
- String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
-
- /** The default ssl-require-authentication value (<code>true</code>) */
- boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION =
- DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
-
/** The default disable-tcp value (<code>false</code>) */
boolean DEFAULT_DISABLE_TCP = DistributionConfig.DEFAULT_DISABLE_TCP;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index 517f5a6..8f65506 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -160,10 +160,10 @@ public class DistributedSystemConfigImpl
this.systemName = distConfig.getName();
- this.sslEnabled = distConfig.getSSLEnabled();
- this.sslCiphers = distConfig.getSSLCiphers();
- this.sslProtocols = distConfig.getSSLProtocols();
- this.sslAuthenticationRequired = distConfig.getSSLRequireAuthentication();
+ this.sslEnabled = distConfig.getClusterSSLEnabled();
+ this.sslCiphers = distConfig.getClusterSSLCiphers();
+ this.sslProtocols = distConfig.getClusterSSLProtocols();
+ this.sslAuthenticationRequired = distConfig.getClusterSSLRequireAuthentication();
this.logFile = distConfig.getLogFile().getPath();
this.logLevel =
@@ -857,13 +857,13 @@ public class DistributedSystemConfigImpl
// SSL support...
// -------------------------------------------------------------------------
private boolean sslEnabled =
- DistributionConfig.DEFAULT_SSL_ENABLED;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_ENABLED;
private String sslProtocols =
- DistributionConfig.DEFAULT_SSL_PROTOCOLS;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_PROTOCOLS;
private String sslCiphers =
- DistributionConfig.DEFAULT_SSL_CIPHERS;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
private boolean sslAuthenticationRequired =
- DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
private Properties sslProperties = new Properties();
public boolean isSSLEnabled() {
@@ -1097,16 +1097,16 @@ public class DistributedSystemConfigImpl
buf.append(" " + REMOTE_COMMAND_NAME + "=");
buf.append(String.valueOf(this.remoteCommand));
buf.append(lf);
- buf.append(" " + SSL_ENABLED + "=");
+ buf.append(" " + CLUSTER_SSL_ENABLED + "=");
buf.append(String.valueOf(this.sslEnabled));
buf.append(lf);
- buf.append(" " + SSL_CIPHERS_NAME + "=");
+ buf.append(" " + CLUSTER_SSL_CIPHERS + "=");
buf.append(String.valueOf(this.sslCiphers));
buf.append(lf);
- buf.append(" " + SSL_PROTOCOLS_NAME + "=");
+ buf.append(" " + CLUSTER_SSL_PROTOCOLS + "=");
buf.append(String.valueOf(this.sslProtocols));
buf.append(lf);
- buf.append(" " + SSL_REQUIRE_AUTHENTICATION_NAME + "=");
+ buf.append(" " + CLUSTER_SSL_REQUIRE_AUTHENTICATION + "=");
buf.append(String.valueOf(this.sslAuthenticationRequired));
buf.append(lf);
buf.append(" " + LOG_FILE_NAME + "=");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
index ff139c5..465d7ae 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
@@ -318,16 +318,16 @@ class EnabledManagedEntityController implements ManagedEntityController {
MCAST_PORT,
"0");
sslProps.setProperty(prefix +
- SSL_ENABLED,
+ CLUSTER_SSL_ENABLED,
String.valueOf(config.isSSLEnabled()));
sslProps.setProperty(prefix +
- SSL_CIPHERS,
+ CLUSTER_SSL_CIPHERS,
config.getSSLCiphers());
sslProps.setProperty(prefix +
- SSL_PROTOCOLS,
+ CLUSTER_SSL_PROTOCOLS,
config.getSSLProtocols());
sslProps.setProperty(prefix +
- SSL_REQUIRE_AUTHENTICATION,
+ CLUSTER_SSL_REQUIRE_AUTHENTICATION,
String.valueOf(config.isSSLAuthenticationRequired()));
return sslProps;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
index 6c24816..665a78b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
@@ -16,6 +16,22 @@
*/
package com.gemstone.gemfire.admin.jmx.internal;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.admin.DistributedSystemConfig;
import com.gemstone.gemfire.admin.DistributionLocatorConfig;
@@ -27,16 +43,6 @@ import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.util.IOUtils;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-
/**
* Provides the JMX Agent configuration properties.
* <p>
@@ -47,11 +53,9 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
* remarks on individual properties for further information.
* <p>
* Extends and implements DistributedSystemConfig.
- *
* @since GemFire 3.5 (in which it was named AgentConfig)
*/
-public class AgentConfigImpl extends DistributedSystemConfigImpl
- implements AgentConfig {
+public class AgentConfigImpl extends DistributedSystemConfigImpl implements AgentConfig {
// -------------------------------------------------------------------------
// Static class variable(s)
@@ -79,38 +83,31 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* The name of the "locator.host-" property
*/
- public static final String LOCATOR_HOST_NAME =
- "locator.host-";
+ public static final String LOCATOR_HOST_NAME = "locator.host-";
/**
* The name of the "locator.port-" property
*/
- public static final String LOCATOR_PORT_NAME =
- "locator.port-";
+ public static final String LOCATOR_PORT_NAME = "locator.port-";
/**
* The name of the "locator.product-directory-" property
*/
- public static final String LOCATOR_PRODUCT_DIRECTORY_NAME =
- "locator.product-directory-";
+ public static final String LOCATOR_PRODUCT_DIRECTORY_NAME = "locator.product-directory-";
/**
* The name of the "locator.working-directory-" property
*/
- public static final String LOCATOR_WORKING_DIRECTORY_NAME =
- "locator.working-directory-";
+ public static final String LOCATOR_WORKING_DIRECTORY_NAME = "locator.working-directory-";
/**
* The name of the "locator.remote-command-" property
*/
- public static final String LOCATOR_REMOTE_COMMAND =
- "locator.remote-command-";
+ public static final String LOCATOR_REMOTE_COMMAND = "locator.remote-command-";
/**
* The name of the "locator.bind-address-" property
*/
- public static final String LOCATOR_BIND_ADDRESS =
- "locator.bind-address-";
+ public static final String LOCATOR_BIND_ADDRESS = "locator.bind-address-";
/**
* the properties used in configuring a locator's distributed system
*/
- public static final String LOCATOR_DS_PROPERTIES =
- "locator.ds-properties";
+ public static final String LOCATOR_DS_PROPERTIES = "locator.ds-properties";
/**
* The default log file for stand-alone JMX agents
@@ -157,48 +154,29 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
private static Properties getDefaultProperties() {
Properties props = new Properties();
- props.setProperty(AUTO_CONNECT_NAME,
- String.valueOf(DEFAULT_AUTO_CONNECT));
-
- props.setProperty(HTTP_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_ENABLED));
- props.setProperty(HTTP_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
- props.setProperty(HTTP_PORT_NAME,
- String.valueOf(DEFAULT_HTTP_PORT));
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
-
- props.setProperty(RMI_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_ENABLED));
- props.setProperty(RMI_REGISTRY_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
- props.setProperty(RMI_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
- props.setProperty(RMI_PORT_NAME,
- String.valueOf(DEFAULT_RMI_PORT));
- props.setProperty(RMI_SERVER_PORT_NAME,
- String.valueOf(DEFAULT_RMI_SERVER_PORT));
-
- props.setProperty(SNMP_ENABLED_NAME,
- String.valueOf(DEFAULT_SNMP_ENABLED));
- props.setProperty(SNMP_DIRECTORY_NAME,
- String.valueOf(DEFAULT_SNMP_DIRECTORY));
-
- props.setProperty(AGENT_SSL_ENABLED_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
- props.setProperty(AGENT_SSL_PROTOCOLS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
- props.setProperty(AGENT_SSL_CIPHERS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(AUTO_CONNECT_NAME, String.valueOf(DEFAULT_AUTO_CONNECT));
+
+ props.setProperty(HTTP_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_ENABLED));
+ props.setProperty(HTTP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
+ props.setProperty(HTTP_PORT_NAME, String.valueOf(DEFAULT_HTTP_PORT));
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
+
+ props.setProperty(RMI_ENABLED_NAME, String.valueOf(DEFAULT_RMI_ENABLED));
+ props.setProperty(RMI_REGISTRY_ENABLED_NAME, String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
+ props.setProperty(RMI_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
+ props.setProperty(RMI_PORT_NAME, String.valueOf(DEFAULT_RMI_PORT));
+ props.setProperty(RMI_SERVER_PORT_NAME, String.valueOf(DEFAULT_RMI_SERVER_PORT));
+
+ props.setProperty(SNMP_ENABLED_NAME, String.valueOf(DEFAULT_SNMP_ENABLED));
+ props.setProperty(SNMP_DIRECTORY_NAME, String.valueOf(DEFAULT_SNMP_DIRECTORY));
+
+ props.setProperty(AGENT_SSL_ENABLED_NAME, String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
+ props.setProperty(AGENT_SSL_PROTOCOLS_NAME, String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
+ props.setProperty(AGENT_SSL_CIPHERS_NAME, String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
return props;
}
@@ -206,131 +184,90 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns default values for all valid agent properties as a Properties
* object.
- *
* @return default values for all valid agent properties
*/
static Properties getDefaultValuesForAllProperties() {
Properties props = new Properties();
- props.setProperty(AUTO_CONNECT_NAME,
- String.valueOf(DEFAULT_AUTO_CONNECT));
+ props.setProperty(AUTO_CONNECT_NAME, String.valueOf(DEFAULT_AUTO_CONNECT));
- props.setProperty(HTTP_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_ENABLED));
+ props.setProperty(HTTP_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_ENABLED));
- props.setProperty(HTTP_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
+ props.setProperty(HTTP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
- props.setProperty(HTTP_PORT_NAME,
- String.valueOf(DEFAULT_HTTP_PORT));
+ props.setProperty(HTTP_PORT_NAME, String.valueOf(DEFAULT_HTTP_PORT));
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
- props.setProperty(RMI_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_ENABLED));
+ props.setProperty(RMI_ENABLED_NAME, String.valueOf(DEFAULT_RMI_ENABLED));
- props.setProperty(RMI_REGISTRY_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
+ props.setProperty(RMI_REGISTRY_ENABLED_NAME, String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
- props.setProperty(RMI_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
+ props.setProperty(RMI_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
- props.setProperty(RMI_PORT_NAME,
- String.valueOf(DEFAULT_RMI_PORT));
+ props.setProperty(RMI_PORT_NAME, String.valueOf(DEFAULT_RMI_PORT));
- props.setProperty(RMI_SERVER_PORT_NAME,
- String.valueOf(DEFAULT_RMI_SERVER_PORT));
+ props.setProperty(RMI_SERVER_PORT_NAME, String.valueOf(DEFAULT_RMI_SERVER_PORT));
- props.setProperty(SNMP_ENABLED_NAME,
- String.valueOf(DEFAULT_SNMP_ENABLED));
+ props.setProperty(SNMP_ENABLED_NAME, String.valueOf(DEFAULT_SNMP_ENABLED));
- props.setProperty(SNMP_DIRECTORY_NAME,
- String.valueOf(DEFAULT_SNMP_DIRECTORY));
+ props.setProperty(SNMP_DIRECTORY_NAME, String.valueOf(DEFAULT_SNMP_DIRECTORY));
- props.setProperty(AGENT_SSL_ENABLED_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
+ props.setProperty(AGENT_SSL_ENABLED_NAME, String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
- props.setProperty(AGENT_SSL_PROTOCOLS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
+ props.setProperty(AGENT_SSL_PROTOCOLS_NAME, String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
- props.setProperty(AGENT_SSL_CIPHERS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
+ props.setProperty(AGENT_SSL_CIPHERS_NAME, String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(SNMP_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_SNMP_BIND_ADDRESS));
+ props.setProperty(SNMP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_SNMP_BIND_ADDRESS));
- props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME,
- String.valueOf(DEFAULT_EMAIL_NOTIFICATIONS_ENABLED));
+ props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME, String.valueOf(DEFAULT_EMAIL_NOTIFICATIONS_ENABLED));
- props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME,
- String.valueOf(DEFAULT_EMAIL_HOST));
+ props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME, String.valueOf(DEFAULT_EMAIL_HOST));
- props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME,
- String.valueOf(DEFAULT_EMAIL_FROM));
+ props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, String.valueOf(DEFAULT_EMAIL_FROM));
- props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME,
- String.valueOf(DEFAULT_EMAIL_TO_LIST));
+ props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, String.valueOf(DEFAULT_EMAIL_TO_LIST));
- props.setProperty(STATE_SAVE_FILE_NAME,
- String.valueOf(DEFAULT_STATE_SAVE_FILE));
+ props.setProperty(STATE_SAVE_FILE_NAME, String.valueOf(DEFAULT_STATE_SAVE_FILE));
- props.setProperty(SSL_ENABLED,
- String.valueOf(DEFAULT_SSL_ENABLED));
+ props.setProperty(CLUSTER_SSL_ENABLED, String.valueOf(DEFAULT_CLUSTER_SSL_ENABLED));
- props.setProperty(SSL_PROTOCOLS_NAME,
- String.valueOf(DEFAULT_SSL_PROTOCOLS));
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, String.valueOf(DEFAULT_CLUSTER_SSL_PROTOCOLS));
- props.setProperty(SSL_CIPHERS_NAME,
- String.valueOf(DEFAULT_SSL_CIPHERS));
+ props.setProperty(CLUSTER_SSL_CIPHERS, String.valueOf(DEFAULT_CLUSTER_SSL_CIPHERS));
- props.setProperty(SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(ENTITY_CONFIG_XML_FILE_NAME,
- String.valueOf(DEFAULT_ENTITY_CONFIG_XML_FILE));
+ props.setProperty(ENTITY_CONFIG_XML_FILE_NAME, String.valueOf(DEFAULT_ENTITY_CONFIG_XML_FILE));
- props.setProperty(MCAST_PORT,
- String.valueOf(DEFAULT_MCAST_PORT));
+ props.setProperty(MCAST_PORT, String.valueOf(DEFAULT_MCAST_PORT));
- props.setProperty(MCAST_ADDRESS,
- String.valueOf(DEFAULT_MCAST_ADDRESS));
+ props.setProperty(MCAST_ADDRESS, String.valueOf(DEFAULT_MCAST_ADDRESS));
- props.setProperty(LOCATORS,
- String.valueOf(DEFAULT_LOCATORS));
+ props.setProperty(LOCATORS, String.valueOf(DEFAULT_LOCATORS));
- props.setProperty(BIND_ADDRESS,
- String.valueOf(DEFAULT_BIND_ADDRESS));
+ props.setProperty(BIND_ADDRESS, String.valueOf(DEFAULT_BIND_ADDRESS));
- props.setProperty(REMOTE_COMMAND_NAME,
- String.valueOf(DEFAULT_REMOTE_COMMAND));
+ props.setProperty(REMOTE_COMMAND_NAME, String.valueOf(DEFAULT_REMOTE_COMMAND));
- props.setProperty(LOG_FILE_NAME,
- String.valueOf(DEFAULT_LOG_FILE));
+ props.setProperty(LOG_FILE_NAME, String.valueOf(DEFAULT_LOG_FILE));
- props.setProperty(LOG_LEVEL_NAME,
- String.valueOf(DEFAULT_LOG_LEVEL));
+ props.setProperty(LOG_LEVEL_NAME, String.valueOf(DEFAULT_LOG_LEVEL));
- props.setProperty(LOG_DISK_SPACE_LIMIT_NAME,
- String.valueOf(DEFAULT_LOG_DISK_SPACE_LIMIT));
+ props.setProperty(LOG_DISK_SPACE_LIMIT_NAME, String.valueOf(DEFAULT_LOG_DISK_SPACE_LIMIT));
- props.setProperty(LOG_FILE_SIZE_LIMIT_NAME,
- String.valueOf(DEFAULT_LOG_FILE_SIZE_LIMIT));
+ props.setProperty(LOG_FILE_SIZE_LIMIT_NAME, String.valueOf(DEFAULT_LOG_FILE_SIZE_LIMIT));
- props.setProperty(REFRESH_INTERVAL_NAME,
- String.valueOf(DEFAULT_REFRESH_INTERVAL));
+ props.setProperty(REFRESH_INTERVAL_NAME, String.valueOf(DEFAULT_REFRESH_INTERVAL));
return props;
@@ -500,7 +437,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Constructs new instance of AgentConfig. Supplied command-line arguments
* are used to create a set of non-default properties for initializing this
* AgentConfig.
- *
* @param args array of non-default configuration arguments
*/
public AgentConfigImpl(String[] args) {
@@ -511,7 +447,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Creates a new <code>AgentConfig</code> with the given non-default
* configuration properties.
- *
* @param props overriding non-default configuration properties
*/
public AgentConfigImpl(Properties props) {
@@ -526,7 +461,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Constructs new instance of AgentConfig using the specified property file.
- *
* @param propFile the file to load configuration properties from
*/
public AgentConfigImpl(File propFile) {
@@ -562,14 +496,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Checks to see if this config object is "read only". If it is,
* then an {@link IllegalStateException} is thrown.
- *
* @since GemFire 4.0
*/
@Override
protected void checkReadOnly() {
if (this.agent != null) {
- throw new IllegalStateException(
- LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT.toLocalizedString());
+ throw new IllegalStateException(LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT.toLocalizedString());
}
super.checkReadOnly();
@@ -591,8 +523,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
if (this.url == null) {
return LocalizedStrings.AgentConfigImpl_USING_DEFAULT_CONFIGURATION_BECAUSE_PROPERTY_FILE_WAS_FOUND.toLocalizedString();
} else {
- return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0
- .toLocalizedString(this.url);
+ return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0.toLocalizedString(this.url);
}
}
@@ -606,8 +537,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
f = new File(retrievePropertyFile());
if (!f.isAbsolute()) {
// save to <cwd>/propertyFile
- f = new File(System.getProperty("user.dir"),
- retrievePropertyFile());
+ f = new File(System.getProperty("user.dir"), retrievePropertyFile());
}
} else {
f = new File(this.url.getFile());
@@ -618,7 +548,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Converts the contents of this config to a property instance and Stringifies
* it
- *
* @return contents of this config as String
*/
public String toPropertiesAsString() {
@@ -640,7 +569,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Converts the contents of this config to a property instance.
- *
* @return contents of this config as java.util.Properties
*/
public Properties toProperties() {
@@ -649,9 +577,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Converts the contents of this config to a property instance.
- *
* @param includeDSProperties Should distributed system properties be included in the
- * <code>Properties</code> object? See bug 32682.
+ * <code>Properties</code> object? See bug 32682.
+ *
* @return contents of this config as java.util.Properties
*/
public Properties toProperties(boolean includeDSProperties) {
@@ -695,10 +623,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
- props.setProperty(SSL_ENABLED, toString(SSL_ENABLED, isSSLEnabled()));
- props.setProperty(SSL_PROTOCOLS_NAME, toString(SSL_PROTOCOLS_NAME, getSSLProtocols()));
- props.setProperty(SSL_CIPHERS_NAME, toString(SSL_CIPHERS_NAME, getSSLCiphers()));
- props.setProperty(SSL_REQUIRE_AUTHENTICATION_NAME, toString(SSL_REQUIRE_AUTHENTICATION_NAME, isSSLAuthenticationRequired()));
+ props.setProperty(CLUSTER_SSL_ENABLED, toString(CLUSTER_SSL_ENABLED, isSSLEnabled()));
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, toString(CLUSTER_SSL_PROTOCOLS, getSSLProtocols()));
+ props.setProperty(CLUSTER_SSL_CIPHERS, toString(CLUSTER_SSL_CIPHERS, getSSLCiphers()));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, toString(CLUSTER_SSL_REQUIRE_AUTHENTICATION, isSSLAuthenticationRequired()));
Properties sslProps = getSSLProperties();
if (sslProps.size() > 0) {
@@ -712,8 +640,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
}
if (this.getDistributionLocatorConfigs().length > 0) {
- DistributionLocatorConfig[] configs =
- this.getDistributionLocatorConfigs();
+ DistributionLocatorConfig[] configs = this.getDistributionLocatorConfigs();
for (int i = 0; i < configs.length; i++) {
DistributionLocatorConfig locator = configs[i];
props.setProperty(LOCATOR_HOST_NAME + i, toString(LOCATOR_HOST_NAME, locator.getHost()));
@@ -936,8 +863,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Returns the port of the RMI Connector Server.
* <p>
* See <a href="#rmi-server-port">description</a> above.
- *
* @return the value set for rmi-server-port
+ *
* @since GemFire 6.5
*/
public int getRmiServerPort() {
@@ -946,8 +873,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Sets the port of the RMI Connector Server.
- *
* @param port rmi-server-port to set.
+ *
* @since GemFire 6.5
*/
public void setRmiServerPort(int port) {
@@ -1008,132 +935,79 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Initialize the values of this AgentConfig.
- *
* @param props the configuration values to use
*/
private void initialize(Properties props) {
- this.autoConnect = validateBoolean(props.getProperty(
- AUTO_CONNECT_NAME),
- DEFAULT_AUTO_CONNECT);
-
- this.httpEnabled = validateBoolean(props.getProperty(
- HTTP_ENABLED_NAME),
- DEFAULT_HTTP_ENABLED);
- this.httpBindAddress = validateHttpBindAddress(props.getProperty(
- HTTP_BIND_ADDRESS_NAME));
- this.httpPort = validateHttpPort(props.getProperty(
- HTTP_PORT_NAME));
-
- this.rmiEnabled = validateBoolean(props.getProperty(
- RMI_ENABLED_NAME),
- DEFAULT_RMI_ENABLED);
- this.rmiRegistryEnabled = validateBoolean(props.getProperty(
- RMI_REGISTRY_ENABLED_NAME),
- DEFAULT_RMI_REGISTRY_ENABLED);
-
- this.rmiBindAddress = validateRmiBindAddress(props.getProperty(
- RMI_BIND_ADDRESS_NAME));
- this.rmiPort = validateRmiPort(props.getProperty(
- RMI_PORT_NAME));
- this.rmiServerPort = validateRmiServerPort(props.getProperty(
- RMI_SERVER_PORT_NAME));
-
- this.snmpEnabled = validateBoolean(props.getProperty(
- SNMP_ENABLED_NAME),
- DEFAULT_SNMP_ENABLED);
- this.snmpDirectory = validateSnmpDirectory(props.getProperty(
- SNMP_DIRECTORY_NAME));
-
- this.agentSSLEnabled = validateBoolean(props.getProperty(
- AGENT_SSL_ENABLED_NAME),
- DEFAULT_AGENT_SSL_ENABLED);
- this.agentSSLProtocols = validateNonEmptyString(props.getProperty(
- AGENT_SSL_PROTOCOLS_NAME),
- DEFAULT_AGENT_SSL_PROTOCOLS);
- this.agentSSLCiphers = validateNonEmptyString(props.getProperty(
- AGENT_SSL_CIPHERS_NAME),
- DEFAULT_AGENT_SSL_CIPHERS);
- this.agentSSLRequireAuth = validateBoolean(props.getProperty(
- AGENT_SSL_REQUIRE_AUTHENTICATION_NAME),
- DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION);
- this.httpSSLRequireAuth = validateBoolean(props.getProperty(
- HTTP_SSL_REQUIRE_AUTHENTICATION_NAME),
- DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION);
-
- this.httpAuthEnabled = validateBoolean(props.getProperty(
- HTTP_AUTHENTICATION_ENABLED_NAME),
- DEFAULT_HTTP_AUTHENTICATION_ENABLED);
- this.httpAuthUser = validateNonEmptyString(props.getProperty(
- HTTP_AUTHENTICATION_USER_NAME),
- DEFAULT_HTTP_AUTHENTICATION_USER);
- this.httpAuthPassword = validateNonEmptyString(props.getProperty(
- HTTP_AUTHENTICATION_PASSWORD_NAME),
- DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
-
- this.sslEnabled = validateBoolean(props.getProperty(
- SSL_ENABLED),
- DEFAULT_SSL_ENABLED);
- this.sslProtocols = validateNonEmptyString(props.getProperty(
- SSL_PROTOCOLS_NAME),
- DEFAULT_SSL_PROTOCOLS);
- this.sslCiphers = validateNonEmptyString(props.getProperty(
- SSL_CIPHERS_NAME),
- DEFAULT_SSL_CIPHERS);
- this.sslAuthenticationRequired = validateBoolean(props.getProperty(
- SSL_REQUIRE_AUTHENTICATION_NAME),
- DEFAULT_SSL_REQUIRE_AUTHENTICATION);
+ this.autoConnect = validateBoolean(props.getProperty(AUTO_CONNECT_NAME), DEFAULT_AUTO_CONNECT);
+
+ this.httpEnabled = validateBoolean(props.getProperty(HTTP_ENABLED_NAME), DEFAULT_HTTP_ENABLED);
+ this.httpBindAddress = validateHttpBindAddress(props.getProperty(HTTP_BIND_ADDRESS_NAME));
+ this.httpPort = validateHttpPort(props.getProperty(HTTP_PORT_NAME));
+
+ this.rmiEnabled = validateBoolean(props.getProperty(RMI_ENABLED_NAME), DEFAULT_RMI_ENABLED);
+ this.rmiRegistryEnabled = validateBoolean(props.getProperty(RMI_REGISTRY_ENABLED_NAME), DEFAULT_RMI_REGISTRY_ENABLED);
+
+ this.rmiBindAddress = validateRmiBindAddress(props.getProperty(RMI_BIND_ADDRESS_NAME));
+ this.rmiPort = validateRmiPort(props.getProperty(RMI_PORT_NAME));
+ this.rmiServerPort = validateRmiServerPort(props.getProperty(RMI_SERVER_PORT_NAME));
+
+ this.snmpEnabled = validateBoolean(props.getProperty(SNMP_ENABLED_NAME), DEFAULT_SNMP_ENABLED);
+ this.snmpDirectory = validateSnmpDirectory(props.getProperty(SNMP_DIRECTORY_NAME));
+
+ this.agentSSLEnabled = validateBoolean(props.getProperty(AGENT_SSL_ENABLED_NAME), DEFAULT_AGENT_SSL_ENABLED);
+ this.agentSSLProtocols = validateNonEmptyString(props.getProperty(AGENT_SSL_PROTOCOLS_NAME), DEFAULT_AGENT_SSL_PROTOCOLS);
+ this.agentSSLCiphers = validateNonEmptyString(props.getProperty(AGENT_SSL_CIPHERS_NAME), DEFAULT_AGENT_SSL_CIPHERS);
+ this.agentSSLRequireAuth = validateBoolean(props.getProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME), DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION);
+ this.httpSSLRequireAuth = validateBoolean(props.getProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME), DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION);
+
+ this.httpAuthEnabled = validateBoolean(props.getProperty(HTTP_AUTHENTICATION_ENABLED_NAME), DEFAULT_HTTP_AUTHENTICATION_ENABLED);
+ this.httpAuthUser = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_USER_NAME), DEFAULT_HTTP_AUTHENTICATION_USER);
+ this.httpAuthPassword = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_PASSWORD_NAME), DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
+
+ this.sslEnabled = validateBoolean(props.getProperty(CLUSTER_SSL_ENABLED), DEFAULT_CLUSTER_SSL_ENABLED);
+ this.sslProtocols = validateNonEmptyString(props.getProperty(CLUSTER_SSL_PROTOCOLS), DEFAULT_CLUSTER_SSL_PROTOCOLS);
+ this.sslCiphers = validateNonEmptyString(props.getProperty(CLUSTER_SSL_CIPHERS), DEFAULT_CLUSTER_SSL_CIPHERS);
+ this.sslAuthenticationRequired = validateBoolean(props.getProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION), DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION);
this.sslProperties = new Properties();
for (int i = 0; true; i++) {
String key = "ssl-property-" + i;
String value = props.getProperty(key);
- if (value == null)
+ if (value == null) {
break;
+ }
StringTokenizer st = new StringTokenizer(value, "=");
- if (!st.hasMoreTokens())
+ if (!st.hasMoreTokens()) {
break;
+ }
String propKey = st.nextToken();
- if (!st.hasMoreTokens())
+ if (!st.hasMoreTokens()) {
break;
+ }
String propValue = st.nextToken();
this.sslProperties.put(propKey, propValue);
}
- this.isEmailNotificationEnabled = validateBoolean(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_ENABLED_NAME),
- DEFAULT_EMAIL_NOTIFICATIONS_ENABLED);
- this.emailNotificationHostName = validateNonEmptyString(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_HOST_NAME),
- DEFAULT_EMAIL_HOST);
- this.emailNotificationFrom = validateNonEmptyString(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_FROM_NAME),
- DEFAULT_EMAIL_FROM);
- this.emailNotificationToList = validateNonEmptyString(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_TO_LIST_NAME),
- DEFAULT_EMAIL_TO_LIST);
-
- this.stateSaveFile = validateNonEmptyString(props.getProperty(
- AgentConfig.STATE_SAVE_FILE_NAME),
- DEFAULT_STATE_SAVE_FILE);
+ this.isEmailNotificationEnabled = validateBoolean(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_ENABLED_NAME), DEFAULT_EMAIL_NOTIFICATIONS_ENABLED);
+ this.emailNotificationHostName = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_HOST_NAME), DEFAULT_EMAIL_HOST);
+ this.emailNotificationFrom = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_FROM_NAME), DEFAULT_EMAIL_FROM);
+ this.emailNotificationToList = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_TO_LIST_NAME), DEFAULT_EMAIL_TO_LIST);
+
+ this.stateSaveFile = validateNonEmptyString(props.getProperty(AgentConfig.STATE_SAVE_FILE_NAME), DEFAULT_STATE_SAVE_FILE);
try {
for (int i = 0; true; i++) {
String hostProp = props.getProperty(LOCATOR_HOST_NAME + i);
- if (isEmpty(hostProp))
+ if (isEmpty(hostProp)) {
break;
+ }
String host = hostProp;
- int port = Integer.parseInt(
- props.getProperty(LOCATOR_PORT_NAME + i));
- File workDir = validateWorkingDirectory(
- props.getProperty(LOCATOR_WORKING_DIRECTORY_NAME + i));
- File prodDir = new File(validateProductDirectory(
- props.getProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i)));
- String remoteCmd =
- props.getProperty(LOCATOR_REMOTE_COMMAND + i);
- String bindAddr =
- props.getProperty(LOCATOR_BIND_ADDRESS + i);
-
- DistributionLocatorConfig config =
- this.createDistributionLocatorConfig();
+ int port = Integer.parseInt(props.getProperty(LOCATOR_PORT_NAME + i));
+ File workDir = validateWorkingDirectory(props.getProperty(LOCATOR_WORKING_DIRECTORY_NAME + i));
+ File prodDir = new File(validateProductDirectory(props.getProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i)));
+ String remoteCmd = props.getProperty(LOCATOR_REMOTE_COMMAND + i);
+ String bindAddr = props.getProperty(LOCATOR_BIND_ADDRESS + i);
+
+ DistributionLocatorConfig config = this.createDistributionLocatorConfig();
config.setHost(host);
config.setPort(port);
config.setBindAddress(bindAddr);
@@ -1154,8 +1028,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Filter all agent configuration attributes out of the given <code>Properties</code> object.
* <p/>
- *
* @param props the <code>Properties</code> object of filter agent configuration attributes out of.
+ *
* @see AgentConfigImpl#_getPropertyDescription(String)
*/
private static Properties filterOutAgentProperties(final Properties props) {
@@ -1179,12 +1053,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Appends the log-file property to the Properties object if set of properties does not already define the
* log-file property or the gemfire.agent.log-file property.
* <p/>
- *
* @param props the <code>Properties</code> to append the log-file property to if the property does not exist.
*/
private static void appendLogFileProperty(final Properties props) {
- if (!(props.containsKey(DistributedSystemConfig.LOG_FILE_NAME)
- || props.containsKey(SYSTEM_PROPERTY_PREFIX + DistributedSystemConfig.LOG_FILE_NAME))) {
+ if (!(props.containsKey(DistributedSystemConfig.LOG_FILE_NAME) || props.containsKey(SYSTEM_PROPERTY_PREFIX + DistributedSystemConfig.LOG_FILE_NAME))) {
props.put(DistributedSystemConfig.LOG_FILE_NAME, DEFAULT_LOG_FILE);
}
}
@@ -1194,7 +1066,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Properties. If the supplied property overrides the property in the
* property-file, then property-file value is ignored. System Properties always
* override the supplied properties
- *
* @return appendedProps Properties appened to from the property-file if any
*/
private static Properties appendOptionalPropertyFileProperties(final Properties props) {
@@ -1221,8 +1092,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
}
}
} catch (IOException e) {
- throw new GemFireIOException(LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(
- url.toString()), e);
+ throw new GemFireIOException(LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(url.toString()), e);
} finally {
IOUtils.close(in);
}
@@ -1244,9 +1114,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns a description of the given agent config property
- *
* @throws IllegalArgumentException If <code>prop</code> is not a recognized agent
- * configuration property
+ * configuration property
*/
public static String getPropertyDescription(String prop) {
if (prop.equals(LOG_FILE_NAME)) {
@@ -1259,7 +1128,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_MUCH_DISK_SPACE_CAN_BE_CONSUMED_BY_OLD_INACTIVE_LOG_FILES.toLocalizedString();
} else if (prop.equals(LOG_FILE_SIZE_LIMIT_NAME)) {
return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_LARGE_THE_CURRENT_STATISTIC_ARCHIVE_FILE_CAN_GROW_BEFORE_IT_IS_CLOSED_AND_ARCHIVAL_ROLLS_ON_TO_A_NEW_FILE
- .toLocalizedString();
+ .toLocalizedString();
} else if (prop.equals(MCAST_PORT)) {
return LocalizedStrings.AgentConfigImpl_MULTICAST_PORT_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM.toLocalizedString();
} else if (prop.equals(MCAST_ADDRESS)) {
@@ -1280,13 +1149,13 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES.toLocalizedString();
} else if (prop.equals(REMOTE_COMMAND_NAME)) {
return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_ENABLED)) {
+ } else if (prop.equals(CLUSTER_SSL_ENABLED)) {
return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL.toLocalizedString();
- } else if (prop.equals(SSL_PROTOCOLS_NAME)) {
+ } else if (prop.equals(CLUSTER_SSL_PROTOCOLS)) {
return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_CIPHERS_NAME)) {
+ } else if (prop.equals(CLUSTER_SSL_CIPHERS)) {
return LocalizedStrings.AgentConfigImpl_SSL_CIPHERS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_REQUIRE_AUTHENTICATION_NAME)) {
+ } else if (prop.equals(CLUSTER_SSL_REQUIRE_AUTHENTICATION)) {
return LocalizedStrings.AgentConfigImpl_DOES_CONNECTING_TO_THE_DISTRIBUTED_SYSTEM_REQUIRE_SSL_AUTHENTICATION.toLocalizedString();
} else {
String description = _getPropertyDescription(prop);
@@ -1415,7 +1284,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Parses the array of command-line arguments (format: key=value) into an
* instance of Properties.
- *
* @param args the command-line arguments to convert into a Properties
*/
private static Properties toProperties(String[] args) {
@@ -1461,7 +1329,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Makes sure that the mcast port and locators are correct and
* consistent.
- *
* @throws IllegalArgumentException If configuration is not valid
*/
@Override
@@ -1469,18 +1336,21 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
super.validate();
if (this.httpPort < 0 || this.httpPort > MAX_HTTP_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT)
+ }));
}
if (this.rmiPort < 0 || this.rmiPort > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
if (this.rmiServerPort < 0 || this.rmiServerPort > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
}
@@ -1488,8 +1358,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns defaultValue if value is empty.
*/
- private String validateNonEmptyString(String value,
- String defaultValue) {
+ private String validateNonEmptyString(String value, String defaultValue) {
return isEmpty(value) ? defaultValue : value;
}
@@ -1514,8 +1383,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Returns true if value parses as true; null value returns defaultValue.
*/
private boolean validateBoolean(String value, boolean defaultValue) {
- if (isEmpty(value))
+ if (isEmpty(value)) {
return defaultValue;
+ }
return Boolean.valueOf(value).booleanValue();
}
@@ -1542,8 +1412,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
*/
private int validateHttpPort(int val) {
if (val < 0 || val > MAX_HTTP_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT)
+ }));
}
return val;
}
@@ -1639,8 +1510,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
*/
private int validateRmiPort(int val) {
if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
return val;
}
@@ -1666,8 +1538,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
*/
private int validateRmiServerPort(int val) {
if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
return val;
}
@@ -1722,7 +1595,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* <li> the class path
* </ol>
* Only the first file found will be used.
- *
* @return a <code>URL</code> that names the property file;
* otherwise Null if no property file was found.
*/
@@ -1782,14 +1654,15 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns string representation of the specified object with special
* handling for InetAddress.
- *
* @param obj the object to convert to string
+ *
* @return string representation of the specified object
*/
private static String toString(String attName, java.lang.Object obj) {
if (okToDisplayPropertyValue(attName)) {
- if (obj == null)
+ if (obj == null) {
return "";
+ }
if (obj instanceof InetAddress) {
return InetAddressUtil.toString(obj);
}
@@ -1831,10 +1704,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
// -------------------------------------------------------------------------
// SSL support...
// -------------------------------------------------------------------------
- private boolean sslEnabled = DEFAULT_SSL_ENABLED;
- private String sslProtocols = DEFAULT_SSL_PROTOCOLS;
- private String sslCiphers = DEFAULT_SSL_CIPHERS;
- private boolean sslAuthenticationRequired = DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+ private boolean sslEnabled = DEFAULT_CLUSTER_SSL_ENABLED;
+ private String sslProtocols = DEFAULT_CLUSTER_SSL_PROTOCOLS;
+ private String sslCiphers = DEFAULT_CLUSTER_SSL_CIPHERS;
+ private boolean sslAuthenticationRequired = DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
private Properties sslProperties = new Properties();
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
index 649038e..ac79657 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -78,10 +78,10 @@ implements mx4j.tools.adaptor.AdaptorServerSocketFactory,
String ciphers,
Properties gfsecurityProps) {
if (protocols == null || protocols.length() == 0) {
- protocols = DistributionConfig.DEFAULT_SSL_PROTOCOLS;
+ protocols = DistributionConfig.DEFAULT_CLUSTER_SSL_PROTOCOLS;
}
if (ciphers == null || ciphers.length() == 0) {
- ciphers = DistributionConfig.DEFAULT_SSL_CIPHERS;
+ ciphers = DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
}
this.socketCreator = SocketCreator.createNonDefaultInstance(
useSSL, needClientAuth, protocols, ciphers, gfsecurityProps);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
index e74ae05..207ca0d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -157,6 +157,25 @@ public interface ConfigurationProperties {
* <U>Since</U>: GemFire 8.1
*/
String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
+
+ /**
+ * The static String definition of the cluster ssl prefix <i>"cluster-ssl"</i> used in conjunction with other <i>cluster-ssl-*</i> properties property
+ * <a name="cluster-ssl"/a></p>
+ * <U>Description</U>: The cluster-ssl property prefix
+ */
+ String CLUSTER_SSL_PREFIX = "cluster-ssl";
+
+ /**
+ * The static String definition of the <i>"cluster-ssl-alias"</i> property
+ * <a name="cluster-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used out of a keystore with multiple keys in it.
+ * This alias will be used for all other SSL communication (HTTP Service,JMX,SERVER,GATEWAY) unless specifically overridden by their
+ * corresponding aliases {@link #GATEWAY_SSL_ALIAS}, {@link #HTTP_SERVICE_SSL_ALIAS}, {@link #JMX_MANAGER_SSL_ALIAS}, {@link #SERVER_SSL_ALIAS}
+ * </p>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String CLUSTER_SSL_ALIAS = "cluster-ssl-alias";
/**
* The static String definition of the <i>"cluster-ssl-ciphers"</i> property
* <a name="cluster-ssl-ciphers"/a></p>
@@ -172,8 +191,7 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"cluster-ssl-enabled"</i> property
* <a name="cluster-ssl-enabled"/a></p>
* <U>Description</U>: If true, all gemfire socket communication is
- * configured to use SSL through JSSE. Preferably Use cluster-ssl-* properties
- * rather than ssl-* properties.
+ * configured to use SSL through JSSE.
* </p>
* <U>Default</U>: "false"</p>
* <U>Since</U>: GemFire 8.0
@@ -212,8 +230,7 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"cluster-ssl-protocols"</i> property
* <a name="cluster-ssl-protocols"/a></p>
* <U>Description</U>: A space separated list of the SSL protocols to
- * enable. Those listed must be supported by the available providers.Preferably
- * use cluster-ssl-* properties rather than ssl-* properties.
+ * enable. Those listed must be supported by the available providers.
* </p>
* <U>Default</U>: "any"</p>
* <U>Since</U>: GemFire 8.0
@@ -223,8 +240,7 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"cluster-ssl-require-authentication"</i> property
* <a name="cluster-ssl-require-authentication"/a></p>
* <U>Description</U>: If false, allow ciphers that do not require the
- * client side of the connection to be authenticated.Preferably use
- * cluster-ssl-* properties rather than ssl-* properties.
+ * client side of the connection to be authenticated.
* </p>
* <U>Default</U>: "true"</p>
* <U>Since</U>: GemFire 8.0
@@ -420,6 +436,16 @@ public interface ConfigurationProperties {
*/
String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
/**
+ * The static String definition of the <i>"gateway-ssl-alias"</i> property
+ * <a name="gateway-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for the Gateways.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String GATEWAY_SSL_ALIAS = "gateway-ssl-alias";
+ /**
* The static String definition of the <i>"gateway-ssl-ciphers"</i> property
* <a name="gateway-ssl-ciphers"/a></p>
* <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
@@ -427,6 +453,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
/**
@@ -438,6 +465,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with the optional {@link #GATEWAY_SSL_ALIAS}
*/
String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
/**
@@ -448,6 +476,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
/**
@@ -458,6 +487,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
/**
@@ -468,6 +498,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
/**
@@ -478,6 +509,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
/**
@@ -488,6 +520,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
/**
@@ -498,6 +531,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
/**
@@ -508,6 +542,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
/**
@@ -547,6 +582,16 @@ public interface ConfigurationProperties {
*/
String HTTP_SERVICE_PORT = "http-service-port";
/**
+ * The static String definition of the <i>"http-service-ssl-alias"</i> property
+ * <a name="http-service-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for the HTTP service.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String HTTP_SERVICE_SSL_ALIAS = "http-service-ssl-alias";
+ /**
* The static String definition of the <i>"http-service-ssl-ciphers"</i> property
* <a name="http-service-ssl-ciphers"/a></p>
* <U>Description</U>: A space separated list of the SSL cipher suites to enable.
@@ -554,6 +599,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
/**
@@ -566,6 +612,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with optional {@link #HTTP_SERVICE_SSL_ALIAS}
*/
String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
/**
@@ -576,6 +623,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
/**
@@ -586,6 +634,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
/**
@@ -596,6 +645,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
/**
@@ -606,6 +656,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
/**
@@ -616,6 +667,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
/**
@@ -626,6 +678,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
/**
@@ -636,9 +689,18 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
/**
+ * The static String definition of the jmx-manager-ssl prefix "jmx-manager-ssl-" used in conjunction with other jmx-manager-ssl-* properties</i> property
+ * <a name="jmx-manager-ssl-"/a></p>
+ * <U>Description</U>: The jmx-manager-ssl prefix for.
+ * </p>
+ * <U>Default</U>: Optional</p>
+ */
+ String JMX_MANAGER_SSL_PREFIX = "jmx-manager-ssl-";
+ /**
* The static String definition of the <i>"jmx-manager"</i> property
* <a name="jmx-manager"/a></p>
* <U>Description</U>: If true then this member is willing to be a jmx-manager.
@@ -728,20 +790,6 @@ public interface ConfigurationProperties {
*/
String JMX_MANAGER_PORT = "jmx-manager-port";
/**
- * The static String definition of the <i>"jmx-manager-ssl"</i> property
- * <a name="jmx-manager-ssl"/a></p>
- * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
- * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
- * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
- * without needing to configure it for the other GemFire connections.
- * Ignored if jmx-manager is false.
- * </p>
- * <U>Default</U>: "false"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#jmx-manager-ssl-enabled"><code>jmx-manager-ssl-enabled</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
- */
- String JMX_MANAGER_SSL = "jmx-manager-ssl";
- /**
* The static String definition of the <i>"jmx-manager-start"</i> property
* <a name="jmx-manager-start"/a></p>
* <U>Description</U>: If true then this member will start a jmx manager when
@@ -765,12 +813,23 @@ public interface ConfigurationProperties {
*/
String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
/**
+ * The static String definition of the <i>"jmx-manager-ssl-alias"</i> property
+ * <a name="jmx-manager-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for the jmx manager.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String JMX_MANAGER_SSL_ALIAS = "jmx-manager-ssl-alias";
+ /**
* The static String definition of the <i>"jmx-manager-ssl-ciphers"</i> property
* <a name="jmx-manager-ssl-ciphers"/a></p>
* <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
* Those listed must be supported by the available providers.
* </p>
* <U>Default</U>: "any"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
/**
@@ -783,6 +842,7 @@ public interface ConfigurationProperties {
* Ignored if jmx-manager is false.
* </p>
* <U>Default</U>: "false"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with optional {@link #JMX_MANAGER_SSL_ALIAS}
*/
String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
/**
@@ -793,6 +853,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
/**
@@ -803,6 +864,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
/**
@@ -813,6 +875,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
/**
@@ -822,6 +885,7 @@ public interface ConfigurationProperties {
* Those listed must be supported by the available providers.
* </p>
* <U>Default</U>: "any"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
/**
@@ -831,6 +895,7 @@ public interface ConfigurationProperties {
* side of the connection to be authenticated.
* </p>
* <U>Default</U>: "true"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
/**
@@ -841,6 +906,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
/**
@@ -851,6 +917,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
/**
@@ -1221,6 +1288,16 @@ public interface ConfigurationProperties {
*/
String SERVER_BIND_ADDRESS = "server-bind-address";
/**
+ * The static String definition of the <i>"server-ssl-alias"</i> property
+ * <a name="server-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for client-server.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String SERVER_SSL_ALIAS = "server-ssl-alias";
+ /**
* The static String definition of the <i>"server-ssl-ciphers"</i> property
* <a name="server-ssl-ciphers"/a></p>
* <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
@@ -1228,6 +1305,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
/**
@@ -1239,6 +1317,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with optional {@link #SERVER_SSL_ALIAS}
*/
String SERVER_SSL_ENABLED = "server-ssl-enabled";
/**
@@ -1249,6 +1328,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
/**
@@ -1259,6 +1339,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
/**
@@ -1269,6 +1350,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
/**
@@ -1279,6 +1361,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
/**
@@ -1289,6 +1372,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
/**
@@ -1299,6 +1383,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
/**
@@ -1309,6 +1394,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
/**
@@ -1536,48 +1622,4 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"distributed-transactions"</i> property
*/
String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
- /**
- * The static String definition of the <i>"ssl-enabled"</i> property
- * <a name="ssl-enabled"/a></p>
- * <U>Description</U>: If true, all gemfire socket communication is
- * configured to use SSL through JSSE.
- * </p>
- * <U>Default</U>: "false"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-enabled"><code>cluster-ssl-enabled</code></a> instead.
- * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
- */
- String SSL_ENABLED = "ssl-enabled";
- /**
- * The static String definition of the <i>"ssl-protocols"</i> property
- * <a name="ssl-protocols"/a></p>
- * <U>Description</U>: A space separated list of the SSL protocols to enable.
- * Those listed must be supported by the available providers.
- * </p>
- * <U>Default</U>: "any"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-protocols"><code>cluster-ssl-protocols</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
- */
- String SSL_PROTOCOLS = "ssl-protocols";
- /**
- * The static String definition of the <i>"ssl-ciphers"</i> property
- * <a name="ssl-ciphers"/a></p>
- * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
- * Those listed must be supported by the available providers.
- * </p>
- * <U>Default</U>: "any"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-ciphers"><code>cluster-ssl-ciphers</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
- */
- String SSL_CIPHERS = "ssl-ciphers";
- /**
- * The static String definition of the <i>"ssl-require-authentication"</i> property
- * <a name="ssl-require-authentication"/a></p>
- * <U>Description</U>: If false, allow ciphers that do not require the client
- * side of the connection to be authenticated.
- * </p>
- * <U>Default</U>: "true"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-require-authentication"><code>cluster-ssl-require-authentication</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
- */
- String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index c7eca0f..83508c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -46,9 +46,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
*
*/
@SuppressWarnings("deprecation")
-public abstract class AbstractDistributionConfig
- extends AbstractConfig
- implements DistributionConfig
+public abstract class AbstractDistributionConfig extends AbstractConfig implements DistributionConfig
{
protected Object checkAttribute(String attName, Object value){
@@ -108,10 +106,6 @@ public abstract class AbstractDistributionConfig
@ConfigAttributeChecker(name = TCP_PORT)
protected int checkTcpPort(int value) {
- if ( getSSLEnabled() && value != 0 ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), SSL_ENABLED }));
- }
if ( getClusterSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
.toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
@@ -121,10 +115,6 @@ public abstract class AbstractDistributionConfig
@ConfigAttributeChecker(name = MCAST_PORT)
protected int checkMcastPort(int value) {
- if ( getSSLEnabled() && value != 0 ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), SSL_ENABLED }));
- }
if ( getClusterSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
.toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
@@ -165,15 +155,6 @@ public abstract class AbstractDistributionConfig
return value;
}
- @ConfigAttributeChecker(name=SSL_ENABLED)
- protected Boolean checkSSLEnabled(Boolean value) {
- if ( value.booleanValue() && (getMcastPort() != 0) ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_FALSE_WHEN_2_IS_NOT_0
- .toLocalizedString(new Object[] { SSL_ENABLED, value, MCAST_PORT }));
- }
- return value;
- }
-
@ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED)
protected Boolean checkClusterSSLEnabled(Boolean value) {
if ( value.booleanValue() && (getMcastPort() != 0) ) {
@@ -830,23 +811,6 @@ public abstract class AbstractDistributionConfig
.toLocalizedString(
Boolean.valueOf(DEFAULT_STATISTIC_SAMPLING_ENABLED)));
- m.put(SSL_ENABLED,
- LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
- .toLocalizedString(
- Boolean.valueOf(DEFAULT_SSL_ENABLED)));
-
- m.put(SSL_PROTOCOLS,
- LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
- .toLocalizedString(DEFAULT_SSL_PROTOCOLS));
-
- m.put(SSL_CIPHERS,
- LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
- .toLocalizedString(DEFAULT_SSL_CIPHERS));
-
- m.put(SSL_REQUIRE_AUTHENTICATION,
- LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
- .toLocalizedString(Boolean.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION)));
-
m.put(CLUSTER_SSL_ENABLED,
LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
.toLocalizedString(
@@ -1001,7 +965,6 @@ public abstract class AbstractDistributionConfig
m.put(JMX_MANAGER, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
m.put(JMX_MANAGER_START, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
- m.put(JMX_MANAGER_SSL, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
m.put(JMX_MANAGER_SSL_ENABLED, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
m.put(JMX_MANAGER_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_CIPHERS+"\" meaning your provider''s defaults.");
m.put(JMX_MANAGER_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_PROTOCOLS+"\" meaning defaults of your provider.");
[11/33] incubator-geode git commit: GEODE-1494: Allowing stats to be
measured with callbacks
Posted by ud...@apache.org.
GEODE-1494: Allowing stats to be measured with callbacks
Adding support to measure statistics with suppliers that are sampled
every sample interval. The suppliers are invoked in a separate thread
than the stat sampler so that slow suppliers won't screw up all stats.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/01848b6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/01848b6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/01848b6e
Branch: refs/heads/feature/GEODE-420
Commit: 01848b6eea4f90e9525eb42aba4d10ba0584c415
Parents: e9ffdce
Author: Dan Smith <up...@apache.org>
Authored: Fri Jun 3 12:07:37 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Jun 13 10:45:13 2016 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/Statistics.java | 253 +++++++++++++++++++
.../gemfire/internal/DummyStatisticsImpl.java | 44 ++++
.../gemfire/internal/HostStatSampler.java | 10 +-
.../gemfire/internal/StatSamplerStats.java | 34 ++-
.../gemfire/internal/StatisticsImpl.java | 143 ++++++++++-
.../gemfire/internal/StatisticsTypeImpl.java | 6 +-
.../internal/statistics/CallbackSampler.java | 96 +++++++
.../internal/statistics/SampleCollector.java | 4 +-
.../internal/LocalStatisticsImplJUnitTest.java | 139 ++++++++++
.../StatArchiveWriterReaderJUnitTest.java | 16 +-
.../gemfire/internal/StatSamplerJUnitTest.java | 34 ++-
.../statistics/CallbackSamplerJUnitTest.java | 98 +++++++
.../internal/statistics/DummyStatistics.java | 208 ---------------
13 files changed, 842 insertions(+), 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java b/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
index d7f45a5..0b9c18e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
@@ -18,6 +18,10 @@ package com.gemstone.gemfire;
//import com.gemstone.gemfire.distributed.DistributedSystem;
+import java.util.function.DoubleSupplier;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+
/**
* Instances of this interface maintain the values of various application-defined
* statistics. The statistics themselves are described by an instance
@@ -441,4 +445,253 @@ public interface Statistics {
* type <code>double</code>.
*/
public void incDouble(String name, double delta);
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by long running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param id a statistic id obtained with {@link #nameToId}
+ * or {@link StatisticsType#nameToId}.
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not int
+ */
+ public IntSupplier setIntSupplier(int id, IntSupplier supplier);
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by long running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param name the nane of the statistic to update
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws IllegalArgumentException
+ * If no statistic exists with name <code>name</code> or
+ * if the statistic named <code>name</code> is not of
+ * type <code>int</code>.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not int
+ */
+ public IntSupplier setIntSupplier(String name, IntSupplier supplier);
+
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by long running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param descriptor the descriptor of the statistic to update
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws IllegalArgumentException
+ * If no statistic exists with the given <code>descriptor</code> or
+ * if the described statistic is not of
+ * type <code>int</code>.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not int
+ */
+ public IntSupplier setIntSupplier(StatisticDescriptor descriptor, IntSupplier supplier);
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by long running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param id a statistic id obtained with {@link #nameToId}
+ * or {@link StatisticsType#nameToId}.
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not long
+ */
+ public LongSupplier setLongSupplier(int id, LongSupplier supplier);
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by long running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param name the nane of the statistic to update
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws IllegalArgumentException
+ * If no statistic exists with name <code>name</code> or
+ * if the statistic named <code>name</code> is not of
+ * type <code>long</code>.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not long
+ */
+ public LongSupplier setLongSupplier(String name, LongSupplier supplier);
+
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by long running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param descriptor the descriptor of the statistic to update
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws IllegalArgumentException
+ * If no statistic exists with the given <code>descriptor</code> or
+ * if the described statistic is not of
+ * type <code>long</code>.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not long
+ */
+ public LongSupplier setLongSupplier(StatisticDescriptor descriptor, LongSupplier supplier);
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by double running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param id a statistic id obtained with {@link #nameToId}
+ * or {@link StatisticsType#nameToId}.
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not double
+ */
+ public DoubleSupplier setDoubleSupplier(int id, DoubleSupplier supplier);
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by double running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param name the nane of the statistic to update
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws IllegalArgumentException
+ * If no statistic exists with name <code>name</code> or
+ * if the statistic named <code>name</code> is not of
+ * type <code>double</code>.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not double
+ */
+ public DoubleSupplier setDoubleSupplier(String name, DoubleSupplier supplier);
+
+
+ /**
+ * Provide a callback to compute the value of this statistic
+ * every sample interval and use that as the value of the stat.
+ * <p>
+ * The callback should return quickly because it is invoked on a shared thread.
+ * It should not do any expensive computations, network calls, or access any resources
+ * under locks that may be locked by double running processes.
+ * <p>
+ * This callback will only be invoked if the distributed system property
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals
+ * determined by the statistic-sampling-rate.
+ * <p>
+ * Get methods are not guaranteed to recompute a new value, they may return
+ * the last sampled value
+ * @param descriptor the descriptor of the statistic to update
+ * @param supplier a callback that will return the value of the stat. This
+ * replaces any previously registered supplier. If the passed in suppplier is null, it
+ * will remove any existing supplier
+ * @return the previously registered supplier, or null if there was no previously registered supplier
+ * @throws IllegalArgumentException
+ * If no statistic exists with the given <code>descriptor</code> or
+ * if the described statistic is not of
+ * type <code>double</code>.
+ * @throws IllegalArgumentException if the type of this
+ * stat is not double
+ */
+ public DoubleSupplier setDoubleSupplier(StatisticDescriptor descriptor, DoubleSupplier supplier);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
index 83d4055..aa8da50 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
@@ -16,6 +16,10 @@
*/
package com.gemstone.gemfire.internal;
+import java.util.function.DoubleSupplier;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+
import com.gemstone.gemfire.*;
/**
@@ -195,4 +199,44 @@ public class DummyStatisticsImpl implements Statistics {
public final void incDouble(String name, double delta) {
}
+
+ @Override
+ public IntSupplier setIntSupplier(final int id, final IntSupplier supplier) {
+ return null;
+ }
+
+ @Override
+ public IntSupplier setIntSupplier(final String name, final IntSupplier supplier) {
+ return null;
+ }
+
+ @Override
+ public IntSupplier setIntSupplier(final StatisticDescriptor descriptor, final IntSupplier supplier) {
+ return null;
+ }
+
+ @Override public LongSupplier setLongSupplier(final int id, final LongSupplier supplier) {
+ return null;
+ }
+
+ @Override public LongSupplier setLongSupplier(final String name, final LongSupplier supplier) {
+ return null;
+ }
+
+ @Override public LongSupplier setLongSupplier(final StatisticDescriptor descriptor, final LongSupplier supplier) {
+ return null;
+ }
+
+ @Override public DoubleSupplier setDoubleSupplier(final int id, final DoubleSupplier supplier) {
+ return null;
+ }
+
+ @Override public DoubleSupplier setDoubleSupplier(final String name, final DoubleSupplier supplier) {
+ return null;
+ }
+
+ @Override
+ public DoubleSupplier setDoubleSupplier(final StatisticDescriptor descriptor, final DoubleSupplier supplier) {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
index a5a07ca..38fc83d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
@@ -26,6 +26,7 @@ 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.statistics.CallbackSampler;
import com.gemstone.gemfire.internal.statistics.SampleCollector;
import com.gemstone.gemfire.internal.statistics.StatArchiveHandlerConfig;
import com.gemstone.gemfire.internal.statistics.StatisticsSampler;
@@ -35,6 +36,7 @@ import org.apache.logging.log4j.Logger;
import java.io.File;
import java.net.UnknownHostException;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* HostStatSampler implements a thread which will monitor, sample, and archive
@@ -50,7 +52,7 @@ public abstract class HostStatSampler
public static final String OS_STATS_DISABLED_PROPERTY = "osStatsDisabled";
protected static final String INITIALIZATION_TIMEOUT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "statSamplerInitializationTimeout";
- protected static final int INITIALIZATION_TIMEOUT_DEFAULT = 3000;
+ protected static final int INITIALIZATION_TIMEOUT_DEFAULT = 30000;
protected static final long INITIALIZATION_TIMEOUT_MILLIS =
Long.getLong(INITIALIZATION_TIMEOUT_PROPERTY, INITIALIZATION_TIMEOUT_DEFAULT);
@@ -82,6 +84,8 @@ public abstract class HostStatSampler
private final StoppableCountDownLatch statSamplerInitializedLatch;
private final CancelCriterion stopper;
+
+ private final CallbackSampler callbackSampler;
protected HostStatSampler(CancelCriterion stopper,
StatSamplerStats samplerStats) {
@@ -89,6 +93,7 @@ public abstract class HostStatSampler
this.statSamplerInitializedLatch = new StoppableCountDownLatch(this.stopper, 1);
this.samplerStats = samplerStats;
this.fileSizeLimitInKB = Boolean.getBoolean(TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY);
+ this.callbackSampler = new CallbackSampler(stopper, samplerStats);
}
public final StatSamplerStats getStatSamplerStats() {
@@ -276,6 +281,8 @@ public abstract class HostStatSampler
}
ThreadGroup group =
LoggingThreadGroup.createThreadGroup("StatSampler Threads");
+
+ this.callbackSampler.start(getStatisticsManager(), group, getSampleRate(), TimeUnit.MILLISECONDS);
statThread = new Thread(group, this);
statThread.setName(statThread.getName() + " StatSampler");
statThread.setPriority(Thread.MAX_PRIORITY);
@@ -298,6 +305,7 @@ public abstract class HostStatSampler
}
private final void stop(boolean interruptIfAlive) {
synchronized (HostStatSampler.class) {
+ this.callbackSampler.stop();
if ( statThread == null) {
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/StatSamplerStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatSamplerStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatSamplerStats.java
index c702479..bbe333c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatSamplerStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatSamplerStats.java
@@ -27,13 +27,19 @@ public class StatSamplerStats {
public final static String DELAY_DURATION = "delayDuration"; // int
public final static String STAT_RESOURCES = "statResources"; // int
public final static String JVM_PAUSES = "jvmPauses"; // int
-
+ public final static String SAMPLE_CALLBACKS = "sampleCallbacks"; // int
+ public final static String SAMPLE_CALLBACK_ERRORS = "sampleCallbackErrors"; // int
+ public final static String SAMPLE_CALLBACK_DURATION = "sampleCallbackDuration"; // long
+
private final static StatisticsType samplerType;
private final static int sampleCountId;
private final static int sampleTimeId;
private final static int delayDurationId;
private final static int statResourcesId;
private final static int jvmPausesId;
+ private final static int sampleCallbacksId;
+ private final static int sampleCallbackErrorsId;
+ private final static int sampleCallbackDurationId;
static {
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
samplerType = f.createType("StatSampler",
@@ -54,12 +60,24 @@ public class StatSamplerStats {
f.createIntCounter(JVM_PAUSES,
"Total number of JVM pauses (which may or may not be full GC pauses) detected by this sampler. A JVM pause is defined as a system event which kept the statistics sampler thread from sampling for 3000 or more milliseconds. This threshold can be customized by setting the system property gemfire.statSamplerDelayThreshold (units are milliseconds).",
"jvmPauses", false),
+ f.createIntGauge(SAMPLE_CALLBACKS,
+ "Total number of statistics that are sampled using callbacks.",
+ "resources", false),
+ f.createIntCounter(SAMPLE_CALLBACK_ERRORS,
+ "Total number of exceptions thrown by callbacks when performing sampling",
+ "errors", false),
+ f.createLongCounter(SAMPLE_CALLBACK_DURATION,
+ "Total amount of time invoking sampling callbacks",
+ "milliseconds", false),
});
sampleCountId = samplerType.nameToId(SAMPLE_COUNT);
sampleTimeId = samplerType.nameToId(SAMPLE_TIME);
delayDurationId = samplerType.nameToId(DELAY_DURATION);
statResourcesId = samplerType.nameToId(STAT_RESOURCES);
jvmPausesId = samplerType.nameToId(JVM_PAUSES);
+ sampleCallbacksId = samplerType.nameToId(SAMPLE_CALLBACKS);
+ sampleCallbackErrorsId = samplerType.nameToId(SAMPLE_CALLBACK_ERRORS);
+ sampleCallbackDurationId = samplerType.nameToId(SAMPLE_CALLBACK_DURATION);
}
private final Statistics samplerStats;
@@ -78,7 +96,19 @@ public class StatSamplerStats {
public void incJvmPauses() {
this.samplerStats.incInt(jvmPausesId, 1);
}
-
+
+ public void incSampleCallbackErrors(int delta) {
+ this.samplerStats.incInt(sampleCallbackErrorsId, delta);
+ }
+
+ public void setSampleCallbacks(int count) {
+ this.samplerStats.setInt(sampleCallbacksId, count);
+ }
+
+ public void incSampleCallbackDuration(long delta) {
+ this.samplerStats.incLong(sampleCallbackDurationId, delta);
+ }
+
public int getSampleCount() {
return this.samplerStats.getInt(SAMPLE_COUNT);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
index 2344d93..04bfc01 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
@@ -17,11 +17,23 @@
package com.gemstone.gemfire.internal;
//import com.gemstone.gemfire.distributed.DistributedSystem;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.DoubleSupplier;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+
import com.gemstone.gemfire.StatisticDescriptor;
import com.gemstone.gemfire.Statistics;
import com.gemstone.gemfire.StatisticsType;
import com.gemstone.gemfire.internal.concurrent.Atomics;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
+
+import org.apache.logging.log4j.Logger;
// @todo darrel Add statistics instances to archive when they are created.
/**
@@ -42,6 +54,8 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
* @since GemFire 3.0
*/
public abstract class StatisticsImpl implements Statistics {
+ /** logger - not private for tests */
+ static Logger logger = LogService.getLogger();
/** The type of this statistics instance */
private final StatisticsTypeImpl type;
@@ -61,6 +75,25 @@ public abstract class StatisticsImpl implements Statistics {
/** Uniquely identifies this instance */
private long uniqueId;
+ /**
+ * Suppliers of int sample values to be sampled every sample-interval
+ */
+ private final CopyOnWriteHashMap<Integer, IntSupplier> intSuppliers = new CopyOnWriteHashMap<>();
+ /**
+ * Suppliers of long sample values to be sampled every sample-interval
+ */
+ private final CopyOnWriteHashMap<Integer, LongSupplier> longSuppliers = new CopyOnWriteHashMap<>();
+ /**
+ * Suppliers of double sample values to be sampled every sample-interval
+ */
+ private final CopyOnWriteHashMap<Integer, DoubleSupplier> doubleSuppliers = new CopyOnWriteHashMap<>();
+
+ /**
+ * Suppliers that have previously failed. Tracked to avoid logging many messages about
+ * a failing supplier
+ */
+ private final Set<Object> flakySuppliers = new HashSet<Object>();
+
/////////////////////// Constructors ///////////////////////
/** factory method to create a class that implements Statistics
@@ -362,6 +395,12 @@ public abstract class StatisticsImpl implements Statistics {
}
/**
+ * Increments the value of the statistic of type <code>double</code> at
+ * the given offset by a given amount, but performs no type checking.
+ */
+ protected abstract void _incDouble(int offset, double delta);
+
+ /**
* For internal use only.
* Tells the implementation to prepare the data in this instance
* for sampling.
@@ -372,10 +411,108 @@ public abstract class StatisticsImpl implements Statistics {
}
/**
- * Increments the value of the statistic of type <code>double</code> at
- * the given offset by a given amount, but performs no type checking.
+ * Invoke sample suppliers to retrieve the current value for
+ * the suppler controlled sets and update the stats to reflect
+ * the supplied values.
+ * @return the number of callback errors that occurred while
+ * sampling stats
*/
- protected abstract void _incDouble(int offset, double delta);
+ public int invokeSuppliers() {
+ int errors = 0;
+ for(Map.Entry<Integer, IntSupplier> entry: intSuppliers.entrySet()) {
+ try {
+ _setInt(entry.getKey(), entry.getValue().getAsInt());
+ } catch(Throwable t) {
+ logSupplierError(t, entry.getKey(), entry.getValue());
+ errors++;
+ }
+ }
+ for(Map.Entry<Integer, LongSupplier> entry: longSuppliers.entrySet()) {
+ try {
+ _setLong(entry.getKey(), entry.getValue().getAsLong());
+ } catch(Throwable t) {
+ logSupplierError(t, entry.getKey(), entry.getValue());
+ errors++;
+ }
+ }
+ for(Map.Entry<Integer, DoubleSupplier> entry: doubleSuppliers.entrySet()) {
+ try {
+ _setDouble(entry.getKey(), entry.getValue().getAsDouble());
+ } catch(Throwable t) {
+ logSupplierError(t, entry.getKey(), entry.getValue());
+ errors++;
+ }
+ }
+
+ return errors;
+ }
+
+ private void logSupplierError(final Throwable t, int statId, Object supplier) {
+ if(flakySuppliers.add(supplier)) {
+ logger.warn("Error invoking supplier for stat {}, id {}", this.getTextId(), statId, t);
+ }
+ }
+
+ /**
+ * @return the number of statistics that are measured using supplier callbacks
+ */
+ public int getSupplierCount() {
+ return intSuppliers.size() + doubleSuppliers.size() + longSuppliers.size();
+ }
+
+ @Override
+ public IntSupplier setIntSupplier(final int id, final IntSupplier supplier) {
+ if(id >= type.getIntStatCount()) {
+ throw new IllegalArgumentException("Id " + id + " is not in range for stat" + type);
+ }
+ return intSuppliers.put(id, supplier);
+ }
+
+ @Override
+ public IntSupplier setIntSupplier(final String name, final IntSupplier supplier) {
+ return setIntSupplier(nameToId(name), supplier);
+ }
+
+ @Override
+ public IntSupplier setIntSupplier(final StatisticDescriptor descriptor, final IntSupplier supplier) {
+ return setIntSupplier(getIntId(descriptor), supplier);
+ }
+
+ @Override
+ public LongSupplier setLongSupplier(final int id, final LongSupplier supplier) {
+ if(id >= type.getLongStatCount()) {
+ throw new IllegalArgumentException("Id " + id + " is not in range for stat" + type);
+ }
+ return longSuppliers.put(id, supplier);
+ }
+
+ @Override
+ public LongSupplier setLongSupplier(final String name, final LongSupplier supplier) {
+ return setLongSupplier(nameToId(name), supplier);
+ }
+
+ @Override
+ public LongSupplier setLongSupplier(final StatisticDescriptor descriptor, final LongSupplier supplier) {
+ return setLongSupplier(getLongId(descriptor), supplier);
+ }
+
+ @Override
+ public DoubleSupplier setDoubleSupplier(final int id, final DoubleSupplier supplier) {
+ if(id >= type.getDoubleStatCount()) {
+ throw new IllegalArgumentException("Id " + id + " is not in range for stat" + type);
+ }
+ return doubleSuppliers.put(id, supplier);
+ }
+
+ @Override
+ public DoubleSupplier setDoubleSupplier(final String name, final DoubleSupplier supplier) {
+ return setDoubleSupplier(nameToId(name), supplier);
+ }
+
+ @Override
+ public DoubleSupplier setDoubleSupplier(final StatisticDescriptor descriptor, final DoubleSupplier supplier) {
+ return setDoubleSupplier(getDoubleId(descriptor), supplier);
+ }
@Override
public int hashCode() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
index 2a29d46..ccd4d6c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
@@ -192,19 +192,19 @@ public class StatisticsTypeImpl implements StatisticsType {
/**
* Gets the number of statistics in this type that are ints.
*/
- public final int getIntStatCount() {
+ public int getIntStatCount() {
return this.intStatCount;
}
/**
* Gets the number of statistics in this type that are longs.
*/
- public final int getLongStatCount() {
+ public int getLongStatCount() {
return this.longStatCount;
}
/**
* Gets the number of statistics that are doubles.
*/
- public final int getDoubleStatCount() {
+ public int getDoubleStatCount() {
return this.doubleStatCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
new file mode 100644
index 0000000..0180fba
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.statistics;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import com.gemstone.gemfire.CancelCriterion;
+import com.gemstone.gemfire.Statistics;
+import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.internal.StatSamplerStats;
+import com.gemstone.gemfire.internal.StatisticsImpl;
+import com.gemstone.gemfire.internal.StatisticsManager;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+import org.apache.logging.log4j.Logger;
+
+public class CallbackSampler {
+ private static final Logger logger = LogService.getLogger();
+ private StatisticsManager statisticsManager;
+ private final CancelCriterion cancelCriterion;
+ private long sampleIntervalNanos;
+ private ScheduledExecutorService executor;
+ private final StatSamplerStats statSamplerStats;
+
+ public CallbackSampler( final CancelCriterion cancelCriterion,
+ final StatSamplerStats statSamplerStats)
+ {
+ this.cancelCriterion = cancelCriterion;
+ this.statSamplerStats = statSamplerStats;
+ }
+
+ public void start(StatisticsManager statisticsManager, ThreadGroup threadGroup, int sampleInterval, TimeUnit timeUnit) {
+ ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(runnable -> {
+ Thread thread = new Thread(threadGroup, runnable, "CallbackSampler");
+ thread.setDaemon(true);
+ return thread;
+ });
+ start(executor, statisticsManager, sampleInterval, timeUnit);
+ }
+
+ void start(ScheduledExecutorService executor, StatisticsManager statisticsManager, int sampleInterval, TimeUnit timeUnit) {
+ stop();
+ this.statisticsManager = statisticsManager;
+ this.executor = executor;
+
+ executor.scheduleAtFixedRate(() -> sampleCallbacks(), sampleInterval, sampleInterval, timeUnit);
+ }
+
+ private void sampleCallbacks() {
+ if(cancelCriterion.cancelInProgress() != null) {
+ executor.shutdown();
+ }
+ int errors = 0;
+ int suppliers = 0;
+ long start = System.nanoTime();
+ try {
+ for (Statistics stats : statisticsManager.getStatsList()) {
+ StatisticsImpl statistics = (StatisticsImpl) stats;
+ errors += statistics.invokeSuppliers();
+ suppliers += statistics.getSupplierCount();
+ }
+ } catch(VirtualMachineError e) {
+ SystemFailure.initiateFailure(e);
+ } catch (Throwable throwable) {
+ logger.error("Error invoking statistic suppliers", throwable);
+ } finally {
+ long end = System.nanoTime();
+ statSamplerStats.incSampleCallbackDuration(TimeUnit.NANOSECONDS.toMillis(end - start));
+ statSamplerStats.incSampleCallbackErrors(errors);
+ statSamplerStats.setSampleCallbacks(suppliers);
+ }
+
+ }
+
+ public void stop() {
+ if(executor != null) {
+ this.executor.shutdown();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
index dfb502b..6a3b421 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
@@ -286,7 +286,9 @@ public class SampleCollector {
handler.close();
}
}
- instance = null;
+ if(instance == this) {
+ instance = null;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/test/java/com/gemstone/gemfire/internal/LocalStatisticsImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/LocalStatisticsImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/LocalStatisticsImplJUnitTest.java
new file mode 100644
index 0000000..a9b1ec7
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/LocalStatisticsImplJUnitTest.java
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
+
+import java.util.function.DoubleSupplier;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+
+import com.gemstone.gemfire.StatisticsType;
+import com.gemstone.gemfire.internal.LocalStatisticsImpl;
+import com.gemstone.gemfire.internal.StatisticsImpl;
+import com.gemstone.gemfire.internal.StatisticsManager;
+import com.gemstone.gemfire.internal.StatisticsTypeImpl;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+import org.apache.commons.lang.ObjectUtils.Null;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+
+@Category(UnitTest.class)
+public class LocalStatisticsImplJUnitTest {
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ private StatisticsImpl stats;
+
+ @Before
+ public void createStats() {
+ final StatisticsTypeImpl type = mock(StatisticsTypeImpl.class);
+ when(type.getIntStatCount()).thenReturn(5);
+ when(type.getDoubleStatCount()).thenReturn(5);
+ when(type.getLongStatCount()).thenReturn(5);
+ final String textId = "";
+ final long numbericId = 0;
+ final long uniqueId = 0;
+ final int osStatFlags = 0;
+ final boolean atomicIncrements = false;
+ final StatisticsManager system = mock(StatisticsManager.class);
+ stats = new LocalStatisticsImpl(type, textId, numbericId, uniqueId, atomicIncrements, osStatFlags, system);
+ }
+
+ @Test
+ public void invokeIntSuppliersShouldUpdateStats() {
+ IntSupplier supplier1 = mock(IntSupplier.class);
+ when(supplier1.getAsInt()).thenReturn(23);
+ stats.setIntSupplier(4, supplier1);
+ assertEquals(0, stats.invokeSuppliers());
+
+ verify(supplier1).getAsInt();
+ assertEquals(23, stats.getInt(4));
+ }
+
+ @Test
+ public void invokeLongSuppliersShouldUpdateStats() {
+ LongSupplier supplier1 = mock(LongSupplier.class);
+ when(supplier1.getAsLong()).thenReturn(23L);
+ stats.setLongSupplier(4, supplier1);
+ assertEquals(0, stats.invokeSuppliers());
+
+ verify(supplier1).getAsLong();
+ assertEquals(23L, stats.getLong(4));
+ }
+
+ @Test
+ public void invokeDoubleSuppliersShouldUpdateStats() {
+ DoubleSupplier supplier1 = mock(DoubleSupplier.class);
+ when(supplier1.getAsDouble()).thenReturn(23.3);
+ stats.setDoubleSupplier(4, supplier1);
+ assertEquals(0, stats.invokeSuppliers());
+
+ verify(supplier1).getAsDouble();
+ assertEquals(23.3, stats.getDouble(4), 0.1f);
+ }
+
+ @Test
+ public void getSupplierCountShouldReturnCorrectCount() {
+ IntSupplier supplier1 = mock(IntSupplier.class);
+ stats.setIntSupplier(4, supplier1);
+ assertEquals(1, stats.getSupplierCount());
+ }
+
+ @Test
+ public void invokeSuppliersShouldCatchSupplierErrorsAndReturnCount() {
+ IntSupplier supplier1 = mock(IntSupplier.class);
+ when(supplier1.getAsInt()).thenThrow(NullPointerException.class);
+ stats.setIntSupplier(4, supplier1);
+ assertEquals(1, stats.invokeSuppliers());
+
+ verify(supplier1).getAsInt();
+ }
+
+ @Test
+ public void invokeSuppliersShouldLogErrorOnlyOnce() {
+ final Logger originalLogger = StatisticsImpl.logger;
+ try {
+ final Logger logger = mock(Logger.class);
+ StatisticsImpl.logger = logger;
+ IntSupplier supplier1 = mock(IntSupplier.class);
+ when(supplier1.getAsInt()).thenThrow(NullPointerException.class);
+ stats.setIntSupplier(4, supplier1);
+ assertEquals(1, stats.invokeSuppliers());
+ verify(logger, times(1)).warn(anyString(), anyString(), anyInt(), isA(NullPointerException.class));
+ assertEquals(1, stats.invokeSuppliers());
+ //Make sure the logger isn't invoked again
+ verify(logger, times(1)).warn(anyString(), anyString(), anyInt(), isA(NullPointerException.class));
+ } finally {
+ StatisticsImpl.logger = originalLogger;
+ }
+ }
+
+ @Test
+ public void badSupplierParamShouldThrowError() {
+ IntSupplier supplier1 = mock(IntSupplier.class);
+ when(supplier1.getAsInt()).thenReturn(23);
+ thrown.expect(IllegalArgumentException.class);
+ stats.setIntSupplier(23, supplier1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
index bb15ff2..ea9ff4b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.*;
import java.io.BufferedInputStream;
import java.io.File;
@@ -47,7 +48,6 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
import com.gemstone.gemfire.internal.StatArchiveReader.StatValue;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
import com.gemstone.gemfire.internal.logging.PureLogWriter;
-import com.gemstone.gemfire.internal.statistics.DummyStatistics;
import com.gemstone.gemfire.internal.statistics.ResourceInstance;
import com.gemstone.gemfire.internal.statistics.ResourceType;
import com.gemstone.gemfire.internal.statistics.SampleCollector;
@@ -1575,7 +1575,8 @@ public class StatArchiveWriterReaderJUnitTest {
final StatisticsType statsType = createDummyStatisticsType();
final ResourceType rt = new ResourceType(0, statsType);
- final Statistics statistics = new ClosedStatistics();
+ final Statistics statistics = mock(Statistics.class);
+ when(statistics.isClosed()).thenReturn(true);
final ResourceInstance ri = new ResourceInstance(0, statistics, rt);
// if bug #45377 still existed, this call would throw IllegalStateException
@@ -1602,7 +1603,7 @@ public class StatArchiveWriterReaderJUnitTest {
final StatisticsType statsType = createDummyStatisticsType();
final ResourceType rt = new ResourceType(0, statsType);
- final Statistics statistics = new DummyStatistics();
+ final Statistics statistics = mock(Statistics.class);
final ResourceInstance ri = new ResourceInstance(0, statistics, rt);
writer.sampled(TestStatArchiveWriter.WRITER_INITIAL_DATE_MILLIS + 1000,
@@ -1709,14 +1710,7 @@ public class StatArchiveWriterReaderJUnitTest {
}
};
}
-
- private static class ClosedStatistics extends DummyStatistics {
- @Override
- public boolean isClosed() {
- return true;
- }
- }
-
+
/* [KEEP] alternative method for getting an expected golden file:
Class clazz = getClass();
assertNotNull(clazz);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
index f2946b6..e16eeaf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
@@ -117,11 +117,20 @@ public class StatSamplerJUnitTest {
factory.createLongCounter( "long_counter_9", "d9", "u9"),
factory.createLongCounter( "long_counter_10", "d10", "u10", true),
factory.createLongGauge( "long_gauge_11", "d11", "u11"),
- factory.createLongGauge( "long_gauge_12", "d12", "u12", false)
+ factory.createLongGauge( "long_gauge_12", "d12", "u12", false),
+ factory.createLongGauge( "sampled_long", "d13", "u13", false),
+ factory.createIntGauge( "sampled_int", "d14", "u14", false),
+ factory.createDoubleGauge( "sampled_double", "d15", "u15", false)
};
final StatisticsType ST1 = factory.createType("ST1", "ST1", statsST1);
final Statistics st1_1 = factory.createAtomicStatistics(ST1, "st1_1", 1);
-
+ st1_1.setIntSupplier("sampled_int", () -> 5);
+ getOrCreateExpectedValueMap(st1_1).put("sampled_int", 5);
+ st1_1.setLongSupplier("sampled_long", () -> 6);
+ getOrCreateExpectedValueMap(st1_1).put("sampled_long", 6);
+ st1_1.setDoubleSupplier("sampled_double", () -> 7.0);
+ getOrCreateExpectedValueMap(st1_1).put("sampled_double", 7.0);
+
boolean done = false;
Statistics[] samplerStatsInstances = factory.findStatisticsByTextId("statSampler");
@@ -319,11 +328,7 @@ public class StatSamplerJUnitTest {
private void incDouble(Statistics statistics, String stat, double value) {
assertFalse(statistics.isClosed());
- Map<String,Number> statValues = this.allStatistics.get(statistics.getTextId());
- if (statValues == null) {
- statValues = new HashMap<String,Number>();
- this.allStatistics.put(statistics.getTextId(), statValues);
- }
+ Map<String, Number> statValues = getOrCreateExpectedValueMap(statistics);
statistics.incDouble(stat, value);
statValues.put(stat, statistics.getDouble(stat));
if (this.statisticTypes.get(statistics.getTextId()) == null) {
@@ -333,11 +338,7 @@ public class StatSamplerJUnitTest {
private void incInt(Statistics statistics, String stat, int value) {
assertFalse(statistics.isClosed());
- Map<String,Number> statValues = this.allStatistics.get(statistics.getTextId());
- if (statValues == null) {
- statValues = new HashMap<String,Number>();
- this.allStatistics.put(statistics.getTextId(), statValues);
- }
+ Map<String, Number> statValues = getOrCreateExpectedValueMap(statistics);
statistics.incInt(stat, value);
statValues.put(stat, statistics.getInt(stat));
if (this.statisticTypes.get(statistics.getTextId()) == null) {
@@ -345,13 +346,18 @@ public class StatSamplerJUnitTest {
}
}
- private void incLong(Statistics statistics, String stat, long value) {
- assertFalse(statistics.isClosed());
+ private Map<String, Number> getOrCreateExpectedValueMap(final Statistics statistics) {
Map<String,Number> statValues = this.allStatistics.get(statistics.getTextId());
if (statValues == null) {
statValues = new HashMap<String,Number>();
this.allStatistics.put(statistics.getTextId(), statValues);
}
+ return statValues;
+ }
+
+ private void incLong(Statistics statistics, String stat, long value) {
+ assertFalse(statistics.isClosed());
+ Map<String, Number> statValues = getOrCreateExpectedValueMap(statistics);
statistics.incLong(stat, value);
statValues.put(stat, statistics.getLong(stat));
if (this.statisticTypes.get(statistics.getTextId()) == null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
new file mode 100644
index 0000000..9109ba7
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.statistics;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Arrays;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import com.gemstone.gemfire.CancelCriterion;
+import com.gemstone.gemfire.Statistics;
+import com.gemstone.gemfire.internal.StatSamplerStats;
+import com.gemstone.gemfire.internal.StatisticsImpl;
+import com.gemstone.gemfire.internal.StatisticsManager;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@Category(UnitTest.class)
+@RunWith(MockitoJUnitRunner.class)
+public class CallbackSamplerJUnitTest {
+ @Mock
+ CancelCriterion cancelCriterion;
+ @Mock
+ StatSamplerStats statSamplerStats;
+ @Mock
+ StatisticsManager statisticsManager;
+ @Mock
+ ScheduledExecutorService executorService;
+ private CallbackSampler sampler;
+
+ @Before
+ public void createSampler() {
+ sampler = new CallbackSampler(cancelCriterion, statSamplerStats);
+ }
+
+ @Test
+ public void taskShouldSampleStatistics() {
+ Runnable sampleTask = invokeStartAndGetTask();
+
+ StatisticsImpl stats1 = mock(StatisticsImpl.class);
+ StatisticsImpl stats2 = mock(StatisticsImpl.class);
+ when(stats1.invokeSuppliers()).thenReturn(3);
+ when(stats2.invokeSuppliers()).thenReturn(2);
+ when(stats1.getSupplierCount()).thenReturn(7);
+ when(stats2.getSupplierCount()).thenReturn(8);
+ when(statisticsManager.getStatsList()).thenReturn(Arrays.asList(stats1, stats2));
+ sampleTask.run();
+ verify(statSamplerStats).setSampleCallbacks(eq(15));
+ verify(statSamplerStats).incSampleCallbackErrors(5);
+ verify(statSamplerStats).incSampleCallbackDuration(anyLong());
+ }
+
+ @Test
+ public void stopShouldStopExecutor() {
+ sampler.start(executorService, statisticsManager, 1, TimeUnit.MILLISECONDS);
+ sampler.stop();
+ verify(executorService).shutdown();
+ }
+
+ @Test
+ public void cancelCriterionShouldStopExecutor() {
+ Runnable sampleTask = invokeStartAndGetTask();
+ when(cancelCriterion.cancelInProgress()).thenReturn("cancelled");
+ sampleTask.run();
+ verify(executorService).shutdown();
+ }
+
+ private Runnable invokeStartAndGetTask() {
+ sampler.start(executorService, statisticsManager, 1, TimeUnit.MILLISECONDS);
+ ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
+ verify(executorService).scheduleAtFixedRate(runnableCaptor.capture(), eq(1L), eq(1L), eq(TimeUnit.MILLISECONDS));
+ return runnableCaptor.getValue();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/01848b6e/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
deleted file mode 100755
index a1ea030..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.internal.statistics;
-
-import com.gemstone.gemfire.StatisticDescriptor;
-import com.gemstone.gemfire.Statistics;
-import com.gemstone.gemfire.StatisticsType;
-
-/**
- * @since GemFire 7.0
- */
-public class DummyStatistics implements Statistics {
-
- @Override
- public void close() {
- }
-
- @Override
- public int nameToId(String name) {
- return 0;
- }
-
- @Override
- public StatisticDescriptor nameToDescriptor(String name) {
- return null;
- }
-
- @Override
- public long getUniqueId() {
- return 0;
- }
-
- @Override
- public StatisticsType getType() {
- return null;
- }
-
- @Override
- public String getTextId() {
- return null;
- }
-
- @Override
- public long getNumericId() {
- return 0;
- }
-
- @Override
- public boolean isAtomic() {
- return false;
- }
-
- @Override
- public boolean isClosed() {
- return false;
- }
-
- @Override
- public void setInt(int id, int value) {
- }
-
- @Override
- public void setInt(String name, int value) {
- }
-
- @Override
- public void setInt(StatisticDescriptor descriptor, int value) {
- }
-
- @Override
- public void setLong(int id, long value) {
- }
-
- @Override
- public void setLong(StatisticDescriptor descriptor, long value) {
- }
-
- @Override
- public void setLong(String name, long value) {
- }
-
- @Override
- public void setDouble(int id, double value) {
- }
-
- @Override
- public void setDouble(StatisticDescriptor descriptor, double value) {
- }
-
- @Override
- public void setDouble(String name, double value) {
- }
-
- @Override
- public int getInt(int id) {
- return 0;
- }
-
- @Override
- public int getInt(StatisticDescriptor descriptor) {
- return 0;
- }
-
- @Override
- public int getInt(String name) {
- return 0;
- }
-
- @Override
- public long getLong(int id) {
- return 0;
- }
-
- @Override
- public long getLong(StatisticDescriptor descriptor) {
- return 0;
- }
-
- @Override
- public long getLong(String name) {
- return 0;
- }
-
- @Override
- public double getDouble(int id) {
- return 0;
- }
-
- @Override
- public double getDouble(StatisticDescriptor descriptor) {
- return 0;
- }
-
- @Override
- public double getDouble(String name) {
- return 0;
- }
-
- @Override
- public Number get(StatisticDescriptor descriptor) {
- return null;
- }
-
- @Override
- public Number get(String name) {
- return null;
- }
-
- @Override
- public long getRawBits(StatisticDescriptor descriptor) {
- return 0;
- }
-
- @Override
- public long getRawBits(String name) {
- return 0;
- }
-
- @Override
- public void incInt(int id, int delta) {
- }
-
- @Override
- public void incInt(StatisticDescriptor descriptor, int delta) {
- }
-
- @Override
- public void incInt(String name, int delta) {
- }
-
- @Override
- public void incLong(int id, long delta) {
- }
-
- @Override
- public void incLong(StatisticDescriptor descriptor, long delta) {
- }
-
- @Override
- public void incLong(String name, long delta) {
- }
-
- @Override
- public void incDouble(int id, double delta) {
- }
-
- @Override
- public void incDouble(StatisticDescriptor descriptor, double delta) {
- }
-
- @Override
- public void incDouble(String name, double delta) {
- }
-}
[29/33] incubator-geode git commit: GEODE-420: Initial Alias
defintion and removal of deprecated SSL-ENABLED properties
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index 4d0c5a8..da4209b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -177,7 +177,7 @@ public abstract class AbstractConfig implements Config {
}
private boolean okToDisplayPropertyValue(String attName) {
- if (attName.startsWith(DistributionConfig.SECURITY_PREFIX_NAME)) {
+ if (attName.startsWith(SECURITY_PREFIX)) {
return false;
}
if (attName.startsWith(DistributionConfig.SSL_SYSTEM_PROPS_NAME)) {
@@ -208,18 +208,7 @@ public abstract class AbstractConfig implements Config {
}
public boolean isDeprecated(String attName) {
- if (attName.equals(SSL_CIPHERS)) {
- return true;
- } else if (attName.equals(SSL_ENABLED)) {
- return true;
- } else if (attName.equals(SSL_PROTOCOLS)) {
- return true;
- } else if (attName.equals(SSL_REQUIRE_AUTHENTICATION)) {
- return true;
- } else if (attName.equals(JMX_MANAGER_SSL)) {
- return true;
- }
- return false;
+ return false;
}
public Properties toProperties() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index 36c553e..76ac625 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -32,10 +32,10 @@ public class SSLConfig {
//private static final String PREFIX = "javax.net.ssl.";
- private boolean enabled = DistributionConfig.DEFAULT_SSL_ENABLED;
- private String protocols = DistributionConfig.DEFAULT_SSL_PROTOCOLS;
- private String ciphers = DistributionConfig.DEFAULT_SSL_CIPHERS;
- private boolean requireAuth = DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+ private boolean enabled = DistributionConfig.DEFAULT_CLUSTER_SSL_ENABLED;
+ private String protocols = DistributionConfig.DEFAULT_CLUSTER_SSL_PROTOCOLS;
+ private String ciphers = DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
+ private boolean requireAuth = DistributionConfig.DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
/**
* SSL implementation-specific key-value pairs. Each key should be prefixed
@@ -115,15 +115,15 @@ public class SSLConfig {
* @since GemFire 4.0
*/
public void toDSProperties(Properties props) {
- props.setProperty(SSL_ENABLED,
+ props.setProperty(CLUSTER_SSL_ENABLED,
String.valueOf(this.enabled));
if (this.enabled) {
- props.setProperty(SSL_PROTOCOLS,
+ props.setProperty(CLUSTER_SSL_PROTOCOLS,
this.protocols);
- props.setProperty(SSL_CIPHERS,
+ props.setProperty(CLUSTER_SSL_CIPHERS,
this.ciphers);
- props.setProperty(SSL_REQUIRE_AUTHENTICATION,
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION,
String.valueOf(this.requireAuth));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
index 5f09d7d..c5cf8f5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
@@ -179,26 +179,26 @@ public class GemFireProperties {
* deleted. Set to zero to disable automatic log file deletion.
**/
private int logDiskSpaceLimit;
- /**
- * If true, all gemfire socket communication is configured to use SSL through
- * JSSE.
- **/
- private boolean sslEnabled;
- /**
- * A space seperated list of the SSL cipher suites to enable. Those listed
- * must be supported by the available providers.
- **/
- private String sslCiphers;
- /**
- * A space seperated list of the SSL protocols to enable. Those listed must be
- * supported by the available providers.
- **/
- private String sslProtocols;
- /**
- * If false, allow ciphers that do not require the client side of the
- * connection to be authenticated.
- **/
- private boolean sslRequireAuthentication;
+// /**
+// * If true, all gemfire socket communication is configured to use SSL through
+// * JSSE.
+// **/
+// private boolean sslEnabled;
+// /**
+// * A space seperated list of the SSL cipher suites to enable. Those listed
+// * must be supported by the available providers.
+// **/
+// private String sslCiphers;
+// /**
+// * A space seperated list of the SSL protocols to enable. Those listed must be
+// * supported by the available providers.
+// **/
+// private String sslProtocols;
+// /**
+// * If false, allow ciphers that do not require the client side of the
+// * connection to be authenticated.
+// **/
+// private boolean sslRequireAuthentication;
/**
* The number of milliseconds a thread can keep exclusive access to a socket
* that it is not actively using. Once a thread loses its lease to a socket it
@@ -590,21 +590,21 @@ public class GemFireProperties {
return logDiskSpaceLimit;
}
- public boolean isSslEnabled() {
- return sslEnabled;
- }
-
- public String getSslCiphers() {
- return sslCiphers;
- }
-
- public String getSslProtocols() {
- return sslProtocols;
- }
-
- public boolean isSslRequireAuthentication() {
- return sslRequireAuthentication;
- }
+// public boolean isSslEnabled() {
+// return sslEnabled;
+// }
+//
+// public String getSslCiphers() {
+// return sslCiphers;
+// }
+//
+// public String getSslProtocols() {
+// return sslProtocols;
+// }
+//
+// public boolean isSslRequireAuthentication() {
+// return sslRequireAuthentication;
+// }
public int getSocketLeaseTime() {
return socketLeaseTime;
@@ -885,25 +885,25 @@ public class GemFireProperties {
}
- public void setSslEnabled(boolean sslEnabled) {
- this.sslEnabled = sslEnabled;
-
- }
-
- public void setSslCiphers(String sslCiphers) {
- this.sslCiphers = sslCiphers;
-
- }
-
- public void setSslProtocols(String sslProtocols) {
- this.sslProtocols = sslProtocols;
-
- }
-
- public void setSslRequireAuthentication(boolean sslRequireAuthentication) {
- this.sslRequireAuthentication = sslRequireAuthentication;
-
- }
+// public void setSslEnabled(boolean sslEnabled) {
+// this.sslEnabled = sslEnabled;
+//
+// }
+//
+// public void setSslCiphers(String sslCiphers) {
+// this.sslCiphers = sslCiphers;
+//
+// }
+//
+// public void setSslProtocols(String sslProtocols) {
+// this.sslProtocols = sslProtocols;
+//
+// }
+//
+// public void setSslRequireAuthentication(boolean sslRequireAuthentication) {
+// this.sslRequireAuthentication = sslRequireAuthentication;
+//
+// }
public void setSocketLeaseTime(int socketLeaseTime) {
this.socketLeaseTime = socketLeaseTime;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java
index b802648..9d62fbf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java
@@ -14,8 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.gemstone.gemfire.management.internal.beans;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
+import java.util.Set;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedMember;
@@ -23,27 +35,20 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.management.GemFireProperties;
import com.gemstone.gemfire.management.internal.cli.CliUtil;
-import java.io.*;
-import java.util.Set;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
/**
* Various Utility Functions to be used by MBeans
- *
- *
*/
public class BeanUtilFuncs {
/**
* returns the tail of the log file
- *
* @param logFile
* @return tail of the log file
* @throws IOException
*/
public static String tailSystemLog(File logFile, final int numLines)
- throws IOException {
+ throws IOException
+ {
if (logFile == null || logFile.equals(new File(""))) {
return null;
}
@@ -53,7 +58,7 @@ public class BeanUtilFuncs {
return null;
}
byte[] buffer = (fileLength > maxBuffer) ? new byte[maxBuffer]
- : new byte[(int) fileLength];
+ : new byte[(int) fileLength];
int readSize = buffer.length;
RandomAccessFile f = new RandomAccessFile(logFile, "r");
@@ -93,7 +98,8 @@ public class BeanUtilFuncs {
if (readSize < seekPosition) {
seekPosition = seekPosition - readSize;
- } else {
+ }
+ else {
readSize = (int) seekPosition;
seekPosition = 0;
}
@@ -105,12 +111,9 @@ public class BeanUtilFuncs {
return returnStr.toString();
}
-
-
-
+
/**
- *
* @param sc
* @return tail of log
* @throws IOException
@@ -125,9 +128,10 @@ public class BeanUtilFuncs {
}
return tailSystemLog(logFile, numLines);
}
-
+
public static DistributedMember getDistributedMemberByNameOrId(
- String memberNameOrId) {
+ String memberNameOrId)
+ {
DistributedMember memberFound = null;
if (memberNameOrId != null) {
@@ -135,7 +139,7 @@ public class BeanUtilFuncs {
Set<DistributedMember> memberSet = CliUtil.getAllMembers(cache);
for (DistributedMember member : memberSet) {
if (memberNameOrId.equals(member.getId())
- || memberNameOrId.equals(member.getName())) {
+ || memberNameOrId.equals(member.getName())) {
memberFound = member;
break;
}
@@ -143,7 +147,7 @@ public class BeanUtilFuncs {
}
return memberFound;
}
-
+
public static GemFireProperties initGemfireProperties(DistributionConfig config) {
// **TODO **/
@@ -159,11 +163,11 @@ public class BeanUtilFuncs {
gemFirePropertyData.setMemberGroups(memberGroups);
gemFirePropertyData.setMcastPort(config.getMcastPort());
gemFirePropertyData.setMcastAddress(config.getMcastAddress()
- .getHostAddress());
+ .getHostAddress());
gemFirePropertyData.setBindAddress(config.getBindAddress());
gemFirePropertyData.setTcpPort(config.getTcpPort());
gemFirePropertyData.setCacheXMLFile(config.getCacheXmlFile()
- .getAbsolutePath());
+ .getAbsolutePath());
gemFirePropertyData.setConfigFile(configFile);
gemFirePropertyData.setMcastTTL(config.getMcastTtl());
gemFirePropertyData.setServerBindAddress(config.getServerBindAddress());
@@ -172,30 +176,24 @@ public class BeanUtilFuncs {
gemFirePropertyData.setLogFile(config.getLogFile().getAbsolutePath());
gemFirePropertyData.setLogLevel(config.getLogLevel());
gemFirePropertyData.setStatisticSamplingEnabled(config
- .getStatisticSamplingEnabled());
+ .getStatisticSamplingEnabled());
gemFirePropertyData.setStatisticArchiveFile(config
- .getStatisticArchiveFile().getAbsolutePath());
+ .getStatisticArchiveFile().getAbsolutePath());
gemFirePropertyData.setIncludeFile(includeFile);
gemFirePropertyData.setAckWaitThreshold(config.getAckWaitThreshold());
gemFirePropertyData.setAckSevereAlertThreshold(config
- .getAckSevereAlertThreshold());
+ .getAckSevereAlertThreshold());
gemFirePropertyData.setArchiveFileSizeLimit(config
- .getArchiveFileSizeLimit());
+ .getArchiveFileSizeLimit());
gemFirePropertyData.setArchiveDiskSpaceLimit(config
- .getArchiveDiskSpaceLimit());
+ .getArchiveDiskSpaceLimit());
gemFirePropertyData.setLogFileSizeLimit(config.getLogFileSizeLimit());
gemFirePropertyData.setLogDiskSpaceLimit(config.getLogDiskSpaceLimit());
- gemFirePropertyData.setSslEnabled(config.getSSLEnabled());
- gemFirePropertyData.setSslCiphers(config.getSSLCiphers());
- gemFirePropertyData.setSslProtocols(config.getSSLProtocols());
- gemFirePropertyData.setSslRequireAuthentication(config
- .getSSLRequireAuthentication());
-
gemFirePropertyData.setClusterSSLEnabled(config.getClusterSSLEnabled());
gemFirePropertyData.setClusterSSLCiphers(config.getClusterSSLCiphers());
gemFirePropertyData.setClusterSSLProtocols(config.getClusterSSLProtocols());
@@ -205,7 +203,7 @@ public class BeanUtilFuncs {
gemFirePropertyData.setClusterSSLKeyStorePassword(config.getClusterSSLKeyStorePassword());
gemFirePropertyData.setClusterSSLTrustStore(config.getClusterSSLTrustStore());
gemFirePropertyData.setClusterSSLTrustStorePassword(config.getClusterSSLTrustStorePassword());
-
+
gemFirePropertyData.setServerSSLEnabled(config.getServerSSLEnabled());
gemFirePropertyData.setServerSSLCiphers(config.getServerSSLCiphers());
gemFirePropertyData.setServerSSLProtocols(config.getServerSSLProtocols());
@@ -215,7 +213,7 @@ public class BeanUtilFuncs {
gemFirePropertyData.setServerSSLKeyStorePassword(config.getServerSSLKeyStorePassword());
gemFirePropertyData.setServerSSLTrustStore(config.getServerSSLTrustStore());
gemFirePropertyData.setServerSSLTrustStorePassword(config.getServerSSLTrustStorePassword());
-
+
gemFirePropertyData.setGatewaySSLEnabled(config.getGatewaySSLEnabled());
gemFirePropertyData.setGatewaySSLCiphers(config.getGatewaySSLCiphers());
gemFirePropertyData.setGatewaySSLProtocols(config.getGatewaySSLProtocols());
@@ -225,7 +223,7 @@ public class BeanUtilFuncs {
gemFirePropertyData.setGatewaySSLKeyStorePassword(config.getGatewaySSLKeyStorePassword());
gemFirePropertyData.setGatewaySSLTrustStore(config.getGatewaySSLTrustStore());
gemFirePropertyData.setGatewaySSLTrustStorePassword(config.getGatewaySSLTrustStorePassword());
-
+
gemFirePropertyData.setJmxManagerSSLEnabled(config.getJmxManagerSSLEnabled());
gemFirePropertyData.setJmxManagerSSLCiphers(config.getJmxManagerSSLCiphers());
gemFirePropertyData.setJmxManagerSSLProtocols(config.getJmxManagerSSLProtocols());
@@ -235,7 +233,7 @@ public class BeanUtilFuncs {
gemFirePropertyData.setJmxManagerSSLKeyStorePassword(config.getJmxManagerSSLKeyStorePassword());
gemFirePropertyData.setJmxManagerSSLTrustStore(config.getJmxManagerSSLTrustStore());
gemFirePropertyData.setJmxManagerSSLTrustStorePassword(config.getJmxManagerSSLTrustStorePassword());
-
+
gemFirePropertyData.setHttpServiceSSLEnabled(config.getHttpServiceSSLEnabled());
gemFirePropertyData.setHttpServiceSSLCiphers(config.getHttpServiceSSLCiphers());
gemFirePropertyData.setHttpServiceSSLProtocols(config.getHttpServiceSSLProtocols());
@@ -245,7 +243,7 @@ public class BeanUtilFuncs {
gemFirePropertyData.setHttpServiceSSLKeyStorePassword(config.getHttpServiceSSLKeyStorePassword());
gemFirePropertyData.setHttpServiceSSLTrustStore(config.getHttpServiceSSLTrustStore());
gemFirePropertyData.setHttpServiceSSLTrustStorePassword(config.getHttpServiceSSLTrustStorePassword());
-
+
gemFirePropertyData.setSocketLeaseTime(config.getSocketLeaseTime());
gemFirePropertyData.setSocketBufferSize(config.getSocketBufferSize());
@@ -253,21 +251,21 @@ public class BeanUtilFuncs {
gemFirePropertyData.setMcastRecvBufferSize(config.getMcastRecvBufferSize());
gemFirePropertyData.setMcastByteAllowance(config.getMcastFlowControl()
- .getByteAllowance());
+ .getByteAllowance());
gemFirePropertyData.setMcastRechargeThreshold(config.getMcastFlowControl()
- .getRechargeThreshold());
+ .getRechargeThreshold());
gemFirePropertyData.setMcastRechargeBlockMs(config.getMcastFlowControl()
- .getRechargeBlockMs());
+ .getRechargeBlockMs());
gemFirePropertyData.setUdpFragmentSize(config.getUdpFragmentSize());
gemFirePropertyData.setUdpRecvBufferSize(config.getUdpRecvBufferSize());
gemFirePropertyData.setDisableTcp(config.getDisableTcp());
gemFirePropertyData.setEnableTimeStatistics(config
- .getEnableTimeStatistics());
+ .getEnableTimeStatistics());
gemFirePropertyData.setEnableNetworkPartitionDetection(config
- .getEnableNetworkPartitionDetection());
+ .getEnableNetworkPartitionDetection());
gemFirePropertyData.setMemberTimeout(config.getMemberTimeout());
gemFirePropertyData.setMembershipPortRange(config.getMembershipPortRange());
@@ -275,13 +273,13 @@ public class BeanUtilFuncs {
gemFirePropertyData.setRoles(config.getRoles());
gemFirePropertyData.setMaxWaitTimeForReconnect(config
- .getMaxWaitTimeForReconnect());
+ .getMaxWaitTimeForReconnect());
gemFirePropertyData.setMaxNumReconnectTries(config
- .getMaxNumReconnectTries());
+ .getMaxNumReconnectTries());
gemFirePropertyData.setAsyncDistributionTimeout(config
- .getAsyncDistributionTimeout());
+ .getAsyncDistributionTimeout());
gemFirePropertyData.setAsyncQueueTimeout(config.getAsyncQueueTimeout());
gemFirePropertyData.setAsyncMaxQueueSize(config.getAsyncMaxQueueSize());
@@ -289,31 +287,31 @@ public class BeanUtilFuncs {
gemFirePropertyData.setDurableClientId(config.getDurableClientId());
gemFirePropertyData.setDurableClientTimeout(config
- .getDurableClientTimeout());
+ .getDurableClientTimeout());
gemFirePropertyData.setSecurityClientAuthInit(config
- .getSecurityClientAuthInit());
+ .getSecurityClientAuthInit());
gemFirePropertyData.setSecurityClientAuthenticator(config
- .getSecurityClientAuthenticator());
+ .getSecurityClientAuthenticator());
gemFirePropertyData.setSecurityClientDHAlgo(config
- .getSecurityClientDHAlgo());
+ .getSecurityClientDHAlgo());
gemFirePropertyData.setSecurityPeerAuthInit(config
- .getSecurityPeerAuthInit());
+ .getSecurityPeerAuthInit());
gemFirePropertyData.setSecurityPeerAuthenticator(config
- .getSecurityPeerAuthenticator());
+ .getSecurityPeerAuthenticator());
gemFirePropertyData.setSecurityClientAccessor(config
- .getSecurityClientAccessor());
+ .getSecurityClientAccessor());
gemFirePropertyData.setSecurityClientAccessorPP(config
- .getSecurityClientAccessorPP());
+ .getSecurityClientAccessorPP());
gemFirePropertyData.setSecurityLogLevel(config.getSecurityLogLevel());
gemFirePropertyData.setSecurityLogFile(config.getSecurityLogFile()
- .getAbsolutePath());
+ .getAbsolutePath());
gemFirePropertyData.setSecurityPeerMembershipTimeout(config
- .getSecurityPeerMembershipTimeout());
+ .getSecurityPeerMembershipTimeout());
gemFirePropertyData.setRemoveUnresponsiveClient(config
- .getRemoveUnresponsiveClient());
+ .getRemoveUnresponsiveClient());
gemFirePropertyData.setDeltaPropagation(config.getDeltaPropagation());
gemFirePropertyData.setRedundancyZone(config.getRedundancyZone());
@@ -324,7 +322,6 @@ public class BeanUtilFuncs {
gemFirePropertyData.setJmxManager(config.getJmxManager());
gemFirePropertyData.setJmxManagerStart(config.getJmxManagerStart());
- gemFirePropertyData.setJmxManagerSSL(config.getJmxManagerSSL());
gemFirePropertyData.setJmxManagerPort(config.getJmxManagerPort());
gemFirePropertyData.setJmxManagerBindAddress(config.getJmxManagerBindAddress());
gemFirePropertyData.setJmxManagerHostnameForClients(config.getJmxManagerHostnameForClients());
@@ -339,14 +336,12 @@ public class BeanUtilFuncs {
return gemFirePropertyData;
}
-
+
/**
* Compresses a given String. It is encoded using ISO-8859-1, So any
* decompression of the compressed string should also use ISO-8859-1
- *
- * @param str
- * String to be compressed.
+ * @param str String to be compressed.
* @return compressed bytes
* @throws IOException
*/
@@ -363,9 +358,7 @@ public class BeanUtilFuncs {
}
/**
- *
- * @param bytes
- * bytes to be decompressed
+ * @param bytes bytes to be decompressed
* @return a decompressed String
* @throws IOException
*/
@@ -374,7 +367,7 @@ public class BeanUtilFuncs {
return null;
}
GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(bytes));
- BufferedReader bf = new BufferedReader(new InputStreamReader(gis,"UTF-8"));
+ BufferedReader bf = new BufferedReader(new InputStreamReader(gis, "UTF-8"));
String outStr = "";
String line;
while ((line = bf.readLine()) != null) {
@@ -382,5 +375,5 @@ public class BeanUtilFuncs {
}
return outStr;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 6b1a330..39876ce 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -309,9 +309,9 @@ public class ShellCommands implements CommandMarker {
// Used for gfsh->locator connection & not needed for gfsh->manager connection
if (useSsl || !sslConfigProps.isEmpty()) {
//Fix for 51266 : Added an check for cluster-ssl-enabled proeprty
- if (!sslConfigProps.containsKey(DistributionConfig.CLUSTER_SSL_ENABLED_NAME)) {
- sslConfigProps.put(DistributionConfig.SSL_ENABLED_NAME, String.valueOf(true));
- }
+// if (!sslConfigProps.containsKey(DistributionConfig.CLUSTER_SSL_ENABLED_NAME)) {
+// sslConfigProps.put(DistributionConfig.SSL_ENABLED_NAME, String.valueOf(true));
+// }
sslConfigProps.put(MCAST_PORT, String.valueOf(0));
sslConfigProps.put(LOCATORS, "");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
index fc366ce..9163f95 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
@@ -16,6 +16,39 @@
*/
package com.gemstone.gemfire.management.internal.cli.shell;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.JMX;
+import javax.management.MBeanException;
+import javax.management.MBeanServerConnection;
+import javax.management.MalformedObjectNameException;
+import javax.management.Notification;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import javax.management.QueryExp;
+import javax.management.ReflectionException;
+import javax.management.remote.JMXConnectionNotification;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import javax.rmi.ssl.SslRMIClientSocketFactory;
+
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.lang.StringUtils;
import com.gemstone.gemfire.internal.util.ArrayUtils;
import com.gemstone.gemfire.internal.util.IOUtils;
@@ -29,28 +62,10 @@ import com.gemstone.gemfire.management.internal.cli.LogWrapper;
import com.gemstone.gemfire.management.internal.cli.commands.ShellCommands;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
-import javax.management.*;
-import javax.management.remote.JMXConnectionNotification;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.rmi.ssl.SslRMIClientSocketFactory;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* OperationInvoker JMX Implementation
- *
- *
* @since GemFire 7.0
*/
public class JmxOperationInvoker implements OperationInvoker {
@@ -88,9 +103,8 @@ public class JmxOperationInvoker implements OperationInvoker {
final int port,
final String userName,
final String password,
- final Map<String, String> sslConfigProps, String gfSecurityPropertiesPath)
- throws Exception
- {
+ final Map<String, String> sslConfigProps,
+ String gfSecurityPropertiesPath) throws Exception {
final Set<String> propsToClear = new TreeSet<String>();
try {
this.managerHost = host;
@@ -104,15 +118,15 @@ public class JmxOperationInvoker implements OperationInvoker {
if (userName != null && userName.length() > 0) {
env.put(JMXConnector.CREDENTIALS, new String[] { userName, password });
- }
+ }
Set<Entry<String, String>> entrySet = sslConfigProps.entrySet();
- for (Iterator<Entry<String, String>> it = entrySet.iterator(); it.hasNext();) {
+ for (Iterator<Entry<String, String>> it = entrySet.iterator(); it.hasNext(); ) {
Entry<String, String> entry = it.next();
String key = entry.getKey();
String value = entry.getValue();
- if (key.startsWith("javax.") || key.startsWith("cluster-ssl") || key.startsWith(JMX_MANAGER_SSL)) {
- key = checkforSystemPropertyPrefix(entry.getKey());
- if((key.equals(Gfsh.SSL_ENABLED_CIPHERS) || key.equals(Gfsh.SSL_ENABLED_PROTOCOLS)) && "any".equals(value)){
+ if (key.startsWith("javax.") || key.startsWith(DistributionConfig.CLUSTER_SSL_PREFIX) || key.startsWith(JMX_MANAGER_SSL_PREFIX)) {
+ key = checkforSystemPropertyPrefix(entry.getKey());
+ if ((key.equals(Gfsh.SSL_ENABLED_CIPHERS) || key.equals(Gfsh.SSL_ENABLED_PROTOCOLS)) && "any".equals(value)) {
continue;
}
System.setProperty(key, value);
@@ -120,7 +134,7 @@ public class JmxOperationInvoker implements OperationInvoker {
}
}
- if(!sslConfigProps.isEmpty()){
+ if (!sslConfigProps.isEmpty()) {
if (System.getProperty(Gfsh.SSL_KEYSTORE) != null || System.getProperty(Gfsh.SSL_TRUSTSTORE) != null) {
// use ssl to connect
env.put("com.sun.jndi.rmi.factory.socket", new SslRMIClientSocketFactory());
@@ -129,44 +143,39 @@ public class JmxOperationInvoker implements OperationInvoker {
//Check for JMX Credentials if empty put properties instance directly so that
//jmx management interceptor can read it for custom security properties
- if(!env.containsKey(JMXConnector.CREDENTIALS)) {
+ if (!env.containsKey(JMXConnector.CREDENTIALS)) {
env.put(JMXConnector.CREDENTIALS, readProperties(gfSecurityPropertiesPath));
}
- this.url = new JMXServiceURL(MessageFormat.format(JMX_URL_FORMAT, checkAndConvertToCompatibleIPv6Syntax(host), String.valueOf(port)));
+ this.url = new JMXServiceURL(MessageFormat.format(JMX_URL_FORMAT, checkAndConvertToCompatibleIPv6Syntax(host), String.valueOf(port)));
this.connector = JMXConnectorFactory.connect(url, env);
this.mbsc = connector.getMBeanServerConnection();
this.connector.addConnectionNotificationListener(new JMXConnectionListener(this), null, null);
this.distributedSystemMXBeanProxy = JMX.newMXBeanProxy(mbsc, MBeanJMXAdapter.getDistributedSystemName(), DistributedSystemMXBean.class);
- if (this.distributedSystemMXBeanProxy == null ) {
- LogWrapper.getInstance().info("DistributedSystemMXBean is not present on member with endpoints : "+this.endpoints);
+ if (this.distributedSystemMXBeanProxy == null) {
+ LogWrapper.getInstance().info("DistributedSystemMXBean is not present on member with endpoints : " + this.endpoints);
throw new JMXConnectionException(JMXConnectionException.MANAGER_NOT_FOUND_EXCEPTION);
- }
- else {
+ } else {
this.managerMemberObjectName = this.distributedSystemMXBeanProxy.getMemberObjectName();
if (this.managerMemberObjectName == null || !JMX.isMXBeanInterface(MemberMXBean.class)) {
- LogWrapper.getInstance().info("MemberMXBean with ObjectName "+this.managerMemberObjectName+" is not present on member with endpoints : "+endpoints);
+ LogWrapper.getInstance()
+ .info("MemberMXBean with ObjectName " + this.managerMemberObjectName + " is not present on member with endpoints : " + endpoints);
throw new JMXConnectionException(JMXConnectionException.MANAGER_NOT_FOUND_EXCEPTION);
- }
- else {
+ } else {
this.memberMXBeanProxy = JMX.newMXBeanProxy(mbsc, managerMemberObjectName, MemberMXBean.class);
}
}
this.isConnected.set(true);
this.clusterId = distributedSystemMXBeanProxy.getDistributedSystemId();
- }
- catch (NullPointerException e) {
+ } catch (NullPointerException e) {
throw e;
- }
- catch (MalformedURLException e) {
+ } catch (MalformedURLException e) {
throw e;
- }
- catch (IOException e) {
+ } catch (IOException e) {
throw e;
- }
- finally {
+ } finally {
for (String propToClear : propsToClear) {
System.clearProperty(propToClear);
}
@@ -195,8 +204,7 @@ public class JmxOperationInvoker implements OperationInvoker {
}
// if 'gfSecurityPropertiesPath' OR gfsecurity.properties has resolvable path
if (gfSecurityPropertiesUrl != null) {
- gfshInstance.logToFile("Using security properties file : "
- + CliUtil.decodeWithDefaultCharSet(gfSecurityPropertiesUrl.getPath()), null);
+ gfshInstance.logToFile("Using security properties file : " + CliUtil.decodeWithDefaultCharSet(gfSecurityPropertiesUrl.getPath()), null);
return loadPropertiesFromURL(gfSecurityPropertiesUrl);
}
return null;
@@ -211,9 +219,8 @@ public class JmxOperationInvoker implements OperationInvoker {
inputStream = gfSecurityPropertiesUrl.openStream();
props.load(inputStream);
} catch (IOException io) {
- throw new RuntimeException(CliStrings.format(
- CliStrings.CONNECT__MSG__COULD_NOT_READ_CONFIG_FROM_0,
- CliUtil.decodeWithDefaultCharSet(gfSecurityPropertiesUrl.getPath())), io);
+ throw new RuntimeException(CliStrings.format(CliStrings.CONNECT__MSG__COULD_NOT_READ_CONFIG_FROM_0, CliUtil.decodeWithDefaultCharSet(gfSecurityPropertiesUrl
+ .getPath())), io);
} finally {
IOUtils.close(inputStream);
}
@@ -223,9 +230,10 @@ public class JmxOperationInvoker implements OperationInvoker {
private String checkforSystemPropertyPrefix(String key) {
String returnKey = key;
- if (key.startsWith("javax."))
+ if (key.startsWith("javax.")) {
returnKey = key;
- if (key.startsWith("cluster-ssl") || key.startsWith(JMX_MANAGER_SSL)) {
+ }
+ if (key.startsWith(CLUSTER_SSL_PREFIX) || key.startsWith(JMX_MANAGER_SSL_PREFIX)) {
if (key.endsWith("keystore")) {
returnKey = Gfsh.SSL_KEYSTORE;
} else if (key.endsWith("keystore-password")) {
@@ -239,8 +247,8 @@ public class JmxOperationInvoker implements OperationInvoker {
} else if (key.endsWith("protocols")) {
returnKey = Gfsh.SSL_ENABLED_PROTOCOLS;
}
- }
- return returnKey;
+ }
+ return returnKey;
}
@Override
@@ -256,7 +264,7 @@ public class JmxOperationInvoker implements OperationInvoker {
} catch (MBeanException e) {
throw new JMXInvocationException("Exception while fetching " + attributeName + " for " + resourceName, e);
} catch (ReflectionException e) {
- throw new JMXInvocationException("Couldn't find "+attributeName+" for " + resourceName, e);
+ throw new JMXInvocationException("Couldn't find " + attributeName + " for " + resourceName, e);
} catch (NullPointerException e) {
throw new JMXInvocationException("Given resourceName is null.", e);
} catch (IOException e) {
@@ -277,12 +285,13 @@ public class JmxOperationInvoker implements OperationInvoker {
/**
* JMX Specific operation invoke caller.
- *
* @param resource
* @param operationName
* @param params
* @param signature
+ *
* @return result of JMX Operation invocation
+ *
* @throws JMXInvocationException
*/
protected Object invoke(ObjectName resource, String operationName, Object[] params, String[] signature) throws JMXInvocationException {
@@ -293,7 +302,7 @@ public class JmxOperationInvoker implements OperationInvoker {
} catch (MBeanException e) {
throw new JMXInvocationException("Exception while invoking " + operationName + " on " + resource, e);
} catch (ReflectionException e) {
- throw new JMXInvocationException("Couldn't find "+operationName+" on " + resource + " with arguments "+Arrays.toString(signature), e);
+ throw new JMXInvocationException("Couldn't find " + operationName + " on " + resource + " with arguments " + Arrays.toString(signature), e);
} catch (IOException e) {
throw new JMXInvocationException("Couldn't communicate with remote server at " + toString(), e);
}
@@ -303,8 +312,7 @@ public class JmxOperationInvoker implements OperationInvoker {
try {
return getMBeanServerConnection().queryNames(objectName, queryExpression);
} catch (IOException e) {
- throw new JMXInvocationException(String.format("Failed to communicate with the remote MBean server at (%1$s)!",
- toString()), e);
+ throw new JMXInvocationException(String.format("Failed to communicate with the remote MBean server at (%1$s)!", toString()), e);
}
}
@@ -312,10 +320,8 @@ public class JmxOperationInvoker implements OperationInvoker {
public Object processCommand(final CommandRequest commandRequest) throws JMXInvocationException {
//Gfsh.getCurrentInstance().printAsSevere(String.format("Command (%1$s)%n", commandRequest.getInput()));
if (commandRequest.hasFileData()) {
- return memberMXBeanProxy.processCommand(commandRequest.getInput(), commandRequest.getEnvironment(),
- ArrayUtils.toByteArray(commandRequest.getFileData()));
- }
- else {
+ return memberMXBeanProxy.processCommand(commandRequest.getInput(), commandRequest.getEnvironment(), ArrayUtils.toByteArray(commandRequest.getFileData()));
+ } else {
return memberMXBeanProxy.processCommand(commandRequest.getInput(), commandRequest.getEnvironment());
}
}
@@ -356,14 +362,11 @@ public class JmxOperationInvoker implements OperationInvoker {
}
public <T> T getMBeanProxy(final ObjectName objectName, final Class<T> mbeanInterface) {
- if (DistributedSystemMXBean.class.equals(mbeanInterface)
- && ManagementConstants.OBJECTNAME__DISTRIBUTEDSYSTEM_MXBEAN.equals(objectName.toString())) {
+ if (DistributedSystemMXBean.class.equals(mbeanInterface) && ManagementConstants.OBJECTNAME__DISTRIBUTEDSYSTEM_MXBEAN.equals(objectName.toString())) {
return mbeanInterface.cast(getDistributedSystemMXBean());
- }
- else if (JMX.isMXBeanInterface(mbeanInterface)) {
+ } else if (JMX.isMXBeanInterface(mbeanInterface)) {
return JMX.newMXBeanProxy(getMBeanServerConnection(), objectName, mbeanInterface);
- }
- else {
+ } else {
return JMX.newMBeanProxy(getMBeanServerConnection(), objectName, mbeanInterface);
}
}
@@ -401,11 +404,10 @@ public class JmxOperationInvoker implements OperationInvoker {
* returns the host based on RFC2732 requirements i.e. surrounds the given
* host address string with square brackets. If ":" is not found in the given
* string, simply returns the same string.
+ * @param hostAddress host address to check if it's an IPv6 address
*
- * @param hostAddress
- * host address to check if it's an IPv6 address
* @return for an IPv6 address returns compatible host address otherwise
- * returns the same string
+ * returns the same string
*/
//TODO - Abhishek: move to utility class
// Taken from GFMon
@@ -429,23 +431,23 @@ public class JmxOperationInvoker implements OperationInvoker {
/**
* A Connection Notification Listener. Notifies Gfsh when a connection gets
* terminated abruptly.
- *
* @since GemFire 7.0
*/
class JMXConnectionListener implements NotificationListener {
+
public static final String CHECK_PERIOD_PROP = "jmx.remote.x.client.connection.check.period";
- public static final long CHECK_PERIOD = 1000L;
+ public static final long CHECK_PERIOD = 1000L;
private JmxOperationInvoker invoker;
- JMXConnectionListener (JmxOperationInvoker invoker) {
+ JMXConnectionListener(JmxOperationInvoker invoker) {
this.invoker = invoker;
}
+
@Override
public void handleNotification(Notification notification, Object handback) {
if (JMXConnectionNotification.class.isInstance(notification)) {
- JMXConnectionNotification connNotif = (JMXConnectionNotification)notification;
- if (JMXConnectionNotification.CLOSED.equals(connNotif.getType()) ||
- JMXConnectionNotification.FAILED.equals(connNotif.getType())) {
+ JMXConnectionNotification connNotif = (JMXConnectionNotification) notification;
+ if (JMXConnectionNotification.CLOSED.equals(connNotif.getType()) || JMXConnectionNotification.FAILED.equals(connNotif.getType())) {
this.invoker.isConnected.set(false);
this.invoker.resetClusterId();
if (!this.invoker.isSelfDisconnect.get()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index 7cc475f..88f0208 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -687,7 +687,7 @@ public class InternalDistributedSystemJUnitTest
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "");
- props.setProperty(SSL_ENABLED, "true");
+ props.setProperty(CLUSTER_SSL_ENABLED, "true");
Config config1 = new DistributionConfigImpl(props, false);
Properties props1 = config1.toProperties();
// For the deprecated ssl-* properties a decision was made
@@ -696,12 +696,12 @@ public class InternalDistributedSystemJUnitTest
// and its use in toProperties.
// The other thing that is done is the ssl-* props are copied to cluster-ssl-*.
// The following two assertions demonstrate this.
- assertEquals(null, props1.getProperty(SSL_ENABLED));
+ assertEquals(null, props1.getProperty(CLUSTER_SSL_ENABLED));
assertEquals("true", props1.getProperty(CLUSTER_SSL_ENABLED));
Config config2 = new DistributionConfigImpl(props1, false);
assertEquals(true, config1.sameAs(config2));
Properties props3 = new Properties(props1);
- props3.setProperty(SSL_ENABLED, "false");
+ props3.setProperty(CLUSTER_SSL_ENABLED, "false");
Config config3 = new DistributionConfigImpl(props3, false);
assertEquals(false, config1.sameAs(config3));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
index 400f872..93fc39f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
@@ -40,7 +40,6 @@ public class AbstractConfigJUnitTest {
assertTrue((Boolean) method.invoke(actc, CLUSTER_SSL_ENABLED));
assertFalse((Boolean) method.invoke(actc, GATEWAY_SSL_TRUSTSTORE_PASSWORD));
assertFalse((Boolean) method.invoke(actc, SERVER_SSL_KEYSTORE_PASSWORD));
- assertTrue((Boolean) method.invoke(actc, SSL_ENABLED));
assertTrue((Boolean) method.invoke(actc, CONSERVE_SOCKETS));
assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStorePassword"));
assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStoreType"));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
index d0d906a..30899be 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
@@ -101,10 +101,10 @@ public class JSSESocketJUnitTest {
LogService.setBaseLogLevel(Level.DEBUG);
{
System.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_ENABLED, "true");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_REQUIRE_AUTHENTICATION, "true");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_CIPHERS, "any");
- System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_PROTOCOLS, "TLSv1.2");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + CLUSTER_SSL_ENABLED, "true");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + CLUSTER_SSL_CIPHERS, "any");
+ System.setProperty(DistributionConfig.GEMFIRE_PREFIX + CLUSTER_SSL_PROTOCOLS, "TLSv1.2");
File jks = findTestJKS();
System.setProperty("javax.net.ssl.trustStore", jks.getCanonicalPath());
@@ -164,7 +164,7 @@ public class JSSESocketJUnitTest {
public void testClientSocketFactory() {
System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "clientSocketFactory",
TSocketFactory.class.getName());
- System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + SSL_ENABLED);
+ System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + CLUSTER_SSL_ENABLED);
SocketCreator.getDefaultInstance(new Properties());
factoryInvoked = false;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
index c8addf8..a8e4708 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
@@ -104,7 +104,7 @@ public class SSLConfigJUnitTest {
public void testMCastPortWithSSL() throws Exception {
Properties props = new Properties( );
// default mcast-port is not 0.
- props.setProperty(SSL_ENABLED, "true");
+ props.setProperty(CLUSTER_SSL_ENABLED, "true");
try {
new DistributionConfigImpl( props );
@@ -144,54 +144,54 @@ public class SSLConfigJUnitTest {
boolean requireAuth = true;
DistributionConfigImpl config = new DistributionConfigImpl( new Properties() );
- isEqual( config.getSSLEnabled(), sslenabled );
- isEqual( config.getSSLProtocols(), sslprotocols );
- isEqual( config.getSSLCiphers(), sslciphers );
- isEqual( config.getSSLRequireAuthentication(), requireAuth );
+ isEqual( config.getClusterSSLEnabled(), sslenabled );
+ isEqual( config.getClusterSSLProtocols(), sslprotocols );
+ isEqual( config.getClusterSSLCiphers(), sslciphers );
+ isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
Properties props = new Properties();
sslciphers = "RSA_WITH_GARBAGE";
- props.setProperty(SSL_CIPHERS, sslciphers);
+ props.setProperty(CLUSTER_SSL_CIPHERS, sslciphers);
config = new DistributionConfigImpl( props );
- isEqual( config.getSSLEnabled(), sslenabled );
- isEqual( config.getSSLProtocols(), sslprotocols );
- isEqual( config.getSSLCiphers(), sslciphers );
- isEqual( config.getSSLRequireAuthentication(), requireAuth );
+ isEqual( config.getClusterSSLEnabled(), sslenabled );
+ isEqual( config.getClusterSSLProtocols(), sslprotocols );
+ isEqual( config.getClusterSSLCiphers(), sslciphers );
+ isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
sslprotocols = "SSLv7";
- props.setProperty(SSL_PROTOCOLS, sslprotocols);
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, sslprotocols);
config = new DistributionConfigImpl( props );
- isEqual( config.getSSLEnabled(), sslenabled );
- isEqual( config.getSSLProtocols(), sslprotocols );
- isEqual( config.getSSLCiphers(), sslciphers );
- isEqual( config.getSSLRequireAuthentication(), requireAuth );
+ isEqual( config.getClusterSSLEnabled(), sslenabled );
+ isEqual( config.getClusterSSLProtocols(), sslprotocols );
+ isEqual( config.getClusterSSLCiphers(), sslciphers );
+ isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
requireAuth = false;
- props.setProperty(SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
config = new DistributionConfigImpl( props );
- isEqual( config.getSSLEnabled(), sslenabled );
- isEqual( config.getSSLProtocols(), sslprotocols );
- isEqual( config.getSSLCiphers(), sslciphers );
- isEqual( config.getSSLRequireAuthentication(), requireAuth );
+ isEqual( config.getClusterSSLEnabled(), sslenabled );
+ isEqual( config.getClusterSSLProtocols(), sslprotocols );
+ isEqual( config.getClusterSSLCiphers(), sslciphers );
+ isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
sslenabled = true;
- props.setProperty(SSL_ENABLED, String.valueOf(sslenabled));
+ props.setProperty(CLUSTER_SSL_ENABLED, String.valueOf(sslenabled));
props.setProperty(MCAST_PORT, "0");
config = new DistributionConfigImpl( props );
- isEqual( config.getSSLEnabled(), sslenabled );
- isEqual( config.getSSLProtocols(), sslprotocols );
- isEqual( config.getSSLCiphers(), sslciphers );
- isEqual( config.getSSLRequireAuthentication(), requireAuth );
+ isEqual( config.getClusterSSLEnabled(), sslenabled );
+ isEqual( config.getClusterSSLProtocols(), sslprotocols );
+ isEqual( config.getClusterSSLCiphers(), sslciphers );
+ isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
config = new DistributionConfigImpl( config );
- isEqual( config.getSSLEnabled(), sslenabled );
- isEqual( config.getSSLProtocols(), sslprotocols );
- isEqual( config.getSSLCiphers(), sslciphers );
- isEqual( config.getSSLRequireAuthentication(), requireAuth );
+ isEqual( config.getClusterSSLEnabled(), sslenabled );
+ isEqual( config.getClusterSSLProtocols(), sslprotocols );
+ isEqual( config.getClusterSSLCiphers(), sslciphers );
+ isEqual( config.getClusterSSLRequireAuthentication(), requireAuth );
}
@Test
@@ -340,11 +340,12 @@ public class SSLConfigJUnitTest {
boolean jmxManagerSslRequireAuth = true;
Properties gemFireProps = new Properties();
- gemFireProps.put(JMX_MANAGER_SSL, String.valueOf(jmxManagerSsl));
- gemFireProps.put(JMX_MANAGER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
- gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
- gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
- gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
+ gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(jmxManagerSslenabled));
+ gemFireProps.put(CLUSTER_SSL_PROTOCOLS, jmxManagerSslprotocols);
+ gemFireProps.put(CLUSTER_SSL_CIPHERS, jmxManagerSslciphers);
+ gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
+ //TODO -- UDO: We need to potentially have to implement JMX_MANAGER_SSL_ALIAS
+ gemFireProps.put(JMX_MANAGER_SSL_ALIAS, "");
try{
DistributionConfigImpl config = new DistributionConfigImpl( gemFireProps );
}catch(IllegalArgumentException e){
@@ -359,7 +360,6 @@ public class SSLConfigJUnitTest {
gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(JMX_MANAGER_SSL, String.valueOf(jmxManagerSsl));
gemFireProps.put(JMX_MANAGER_SSL_PROTOCOLS, jmxManagerSslprotocols);
gemFireProps.put(JMX_MANAGER_SSL_CIPHERS, jmxManagerSslciphers);
gemFireProps.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(jmxManagerSslRequireAuth));
@@ -394,6 +394,7 @@ public class SSLConfigJUnitTest {
gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
+
gemFireProps.put(SERVER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
gemFireProps.put(SERVER_SSL_PROTOCOLS, cacheServerSslprotocols);
gemFireProps.put(SERVER_SSL_CIPHERS, cacheServerSslciphers);
@@ -447,175 +448,6 @@ public class SSLConfigJUnitTest {
}
@Test
- public void testCustomizedClusterSslConfig() throws Exception {
- boolean sslenabled = true;
- String sslprotocols = "SSLv1";
- String sslciphers = "RSA_WITH_NOTHING";
- boolean requireAuth = true;
-
- boolean clusterSslenabled = true;
- String clusterSslprotocols = "SSLv7";
- String clusterSslciphers = "RSA_WITH_GARBAGE";
- boolean clusterSslRequireAuth = true;
-
- //sslEnabled and clusterSSLEnabled set at the same time
- Properties gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_ENABLED, "false");
- DistributionConfigImpl config = null;
- try{
- config = new DistributionConfigImpl( gemFireProps );
- throw new Exception();
- }catch(IllegalArgumentException e){
- if (! e.toString().contains( "GemFire properties \'ssl-enabled\' and \'cluster-ssl-enabled\' can not be used at the same time")) {
- throw new Exception( "did not get expected exception, got this instead...", e );
- }
- }
-
- //ssl-protocol and cluster-ssl-protocol set at the same time
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(SSL_PROTOCOLS, sslprotocols);
- gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_PROTOCOLS, clusterSslprotocols);
- try{
- config = new DistributionConfigImpl( gemFireProps );
- throw new Exception();
- }catch(IllegalArgumentException e){
- if (! e.toString().contains( "GemFire properties \'ssl-protocols\' and \'cluster-ssl-protocols\' can not be used at the same time") ) {
- throw new Exception( "did not get expected exception, got this instead...", e );
- }
- }
-
- //ssl-protocol and cluster-ssl-protocol set at the same time with same value
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(SSL_PROTOCOLS, sslprotocols);
- gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_PROTOCOLS, sslprotocols);
- try{
- config = new DistributionConfigImpl( gemFireProps );
- } catch(IllegalArgumentException e){
- throw new Exception();
- }
-
- //ssl-cipher and cluster-ssl-cipher set at the same time
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(SSL_CIPHERS, sslciphers);
- gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_CIPHERS, clusterSslciphers);
- try{
- config = new DistributionConfigImpl( gemFireProps );
- throw new Exception();
- } catch(IllegalArgumentException e){
- if (! e.toString().contains( "GemFire properties \'ssl-cipher\' and \'cluster-ssl-cipher\' can not be used at the same time") ) {
- throw new Exception( "did not get expected exception, got this instead...", e );
- }
- }
-
- //ssl-cipher and cluster-ssl-cipher set at the same time with same value
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(SSL_CIPHERS, sslciphers);
- gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_CIPHERS, sslciphers);
- try{
- config = new DistributionConfigImpl( gemFireProps );
- } catch(IllegalArgumentException e){
- throw new Exception();
- }
-
- //ssl-require-authentication and cluster-ssl-require-authentication set at the same time
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, "true");
- gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "false");
- try{
- config = new DistributionConfigImpl( gemFireProps );
- throw new Exception();
- } catch(IllegalArgumentException e){
- if (! e.toString().contains( "GemFire properties \'ssl-require-authentication\' and \'cluster-ssl-require-authentication\' can not be used at the same time") ) {
- throw new Exception( "did not get expected exception, got this instead...", e );
- }
- }
-
- //ssl-require-authentication and cluster-ssl-require-authentication set at the same time and have the same value
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, "true");
- gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, "true");
- gemFireProps.put(CLUSTER_SSL_ENABLED, "true");
- gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
- try{
- config = new DistributionConfigImpl( gemFireProps );
- } catch(IllegalArgumentException e){
- throw new Exception();
- }
-
- // only ssl-* properties provided. same should reflect in cluster-ssl properties
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(SSL_ENABLED, String.valueOf(sslenabled));
- gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, String.valueOf(requireAuth));
- gemFireProps.put(SSL_CIPHERS, sslciphers);
- gemFireProps.put(SSL_PROTOCOLS, sslprotocols);
-
- gemFireProps.putAll(getGfSecurityPropertiesSSL());
-
- config = new DistributionConfigImpl(gemFireProps);
-
- isEqual(sslenabled, config.getSSLEnabled());
- isEqual(sslprotocols, config.getSSLProtocols());
- isEqual(sslciphers, config.getSSLCiphers());
- isEqual(requireAuth, config.getSSLRequireAuthentication());
-
- isEqual(sslenabled, config.getClusterSSLEnabled());
- isEqual(sslprotocols, config.getClusterSSLProtocols());
- isEqual(sslciphers, config.getClusterSSLCiphers());
- isEqual(requireAuth, config.getClusterSSLRequireAuthentication());
-
- Properties sslProperties = config.getSSLProperties();
- isEqual( SSL_PROPS_MAP , sslProperties);
-
- Properties clusterSSLProperties = config.getClusterSSLProperties();
- isEqual( SSL_PROPS_MAP, clusterSSLProperties );
-
- //only clutser-ssl-properties provided.
- gemFireProps = new Properties();
- gemFireProps.setProperty(MCAST_PORT, "0");
- gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(clusterSslenabled));
- gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(clusterSslRequireAuth));
- gemFireProps.put(CLUSTER_SSL_CIPHERS, clusterSslciphers);
- gemFireProps.put(CLUSTER_SSL_PROTOCOLS, clusterSslprotocols);
-
- gemFireProps.putAll(getGfSecurityPropertiesCluster(false));
-
- config = new DistributionConfigImpl(gemFireProps);
-
- isEqual(clusterSslenabled, config.getClusterSSLEnabled());
- isEqual(clusterSslprotocols, config.getClusterSSLProtocols());
- isEqual(clusterSslciphers, config.getClusterSSLCiphers());
- isEqual(clusterSslRequireAuth, config.getClusterSSLRequireAuthentication());
-
- isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE), config.getClusterSSLKeyStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_TYPE), config.getClusterSSLKeyStoreType());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_KEYSTORE_PASSWORD), config.getClusterSSLKeyStorePassword());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE), config.getClusterSSLTrustStore());
- isEqual(CLUSTER_SSL_PROPS_MAP.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD), config.getClusterSSLTrustStorePassword());
-
- clusterSSLProperties = config.getClusterSSLProperties();
- isEqual( SSL_PROPS_MAP, clusterSSLProperties );
- }
-
- @Test
public void testCustomizedManagerSslConfig() throws Exception {
boolean sslenabled = false;
String sslprotocols = "any";
[25/33] incubator-geode git commit: GEODE-420: Add localized strings
Posted by ud...@apache.org.
GEODE-420: Add localized strings
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b6480b74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b6480b74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b6480b74
Branch: refs/heads/feature/GEODE-420
Commit: b6480b74eeab955455c2d84ac354b4e2ab4693b0
Parents: 806eacd
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Jun 14 11:09:10 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 16 02:17:16 2016 +1000
----------------------------------------------------------------------
.../internal/AbstractDistributionConfig.java | 997 ++++++++-----------
.../gemfire/internal/i18n/LocalizedStrings.java | 7 +
.../internal/DistributionConfigJUnitTest.java | 55 +-
3 files changed, 455 insertions(+), 604 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6480b74/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 83508c2..f53727b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -16,6 +16,19 @@
*/
package com.gemstone.gemfire.distributed.internal;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.InvalidValueException;
import com.gemstone.gemfire.UnmodifiableException;
@@ -27,13 +40,6 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-
/**
* Provides an implementation of <code>DistributionConfig</code> that
* knows how to read the configuration file.
@@ -42,56 +48,58 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
* update the {@link AbstractConfig#sameAs} method and the {@link
* DistributionConfigImpl#DistributionConfigImpl(DistributionConfig)
* copy constructor}.
- *
- *
*/
@SuppressWarnings("deprecation")
-public abstract class AbstractDistributionConfig extends AbstractConfig implements DistributionConfig
-{
+public abstract class AbstractDistributionConfig extends AbstractConfig implements DistributionConfig {
- protected Object checkAttribute(String attName, Object value){
+ protected Object checkAttribute(String attName, Object value) {
// first check to see if this attribute is modifiable, this also checks if the attribute is a valid one.
if (!isAttributeModifiable(attName)) {
throw new UnmodifiableException(_getUnmodifiableMsg(attName));
}
ConfigAttribute attribute = attributes.get(attName);
- if(attribute==null){
+ if (attribute == null) {
// isAttributeModifiable already checks the validity of the attName, if reached here, then they
// must be those special attributes that starts with ssl_system_props or sys_props, no further checking needed
return value;
}
// for integer attribute, do the range check.
- if(attribute.type().equals(Integer.class)){
- Integer intValue = (Integer)value;
+ if (attribute.type().equals(Integer.class)) {
+ Integer intValue = (Integer) value;
minMaxCheck(attName, intValue, attribute.min(), attribute.max());
}
Method checker = checkers.get(attName);
- if(checker==null)
+ if (checker == null) {
return value;
+ }
// if specific checker exists for this attribute, call that with the value
try {
return checker.invoke(this, value);
} catch (Exception e) {
- if(e instanceof RuntimeException){
- throw (RuntimeException)e;
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException) e;
}
- if(e.getCause() instanceof RuntimeException){
- throw (RuntimeException)e.getCause();
+ if (e.getCause() instanceof RuntimeException) {
+ throw (RuntimeException) e.getCause();
+ } else {
+ throw new InternalGemFireException("error invoking " + checker.getName() + " with value " + value);
}
- else
- throw new InternalGemFireException("error invoking "+checker.getName()+" with value "+value);
}
}
protected void minMaxCheck(String propName, int value, int minValue, int maxValue) {
if (value < minValue) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[]{propName, Integer.valueOf(value), Integer.valueOf(minValue)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {
+ propName, Integer.valueOf(value), Integer.valueOf(minValue)
+ }));
} else if (value > maxValue) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[]{propName, Integer.valueOf(value), Integer.valueOf(maxValue)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {
+ propName, Integer.valueOf(value), Integer.valueOf(maxValue)
+ }));
}
}
@@ -106,18 +114,20 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
@ConfigAttributeChecker(name = TCP_PORT)
protected int checkTcpPort(int value) {
- if ( getClusterSSLEnabled() && value != 0 ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
+ if (getClusterSSLEnabled() && value != 0) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE.toLocalizedString(new Object[] {
+ TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED
+ }));
}
return value;
}
@ConfigAttributeChecker(name = MCAST_PORT)
protected int checkMcastPort(int value) {
- if ( getClusterSSLEnabled() && value != 0 ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
+ if (getClusterSSLEnabled() && value != 0) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE.toLocalizedString(new Object[] {
+ MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED
+ }));
}
return value;
}
@@ -125,8 +135,9 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
@ConfigAttributeChecker(name = MCAST_ADDRESS)
protected InetAddress checkMcastAddress(InetAddress value) {
if (!value.isMulticastAddress()) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_IT_WAS_NOT_A_MULTICAST_ADDRESS
- .toLocalizedString(new Object[] { MCAST_ADDRESS, value }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_IT_WAS_NOT_A_MULTICAST_ADDRESS.toLocalizedString(new Object[] {
+ MCAST_ADDRESS, value
+ }));
}
return value;
}
@@ -135,10 +146,9 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
protected String checkBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1
- .toLocalizedString(new Object[]{value, SocketCreator.getMyAddresses()
- }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1.toLocalizedString(new Object[] {
+ value, SocketCreator.getMyAddresses()
+ }));
}
return value;
}
@@ -147,52 +157,50 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
protected String checkServerBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1
- .toLocalizedString(new Object[]{value, SocketCreator.getMyAddresses()
- }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1.toLocalizedString(new Object[] {
+ value, SocketCreator.getMyAddresses()
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED)
+ @ConfigAttributeChecker(name = CLUSTER_SSL_ENABLED)
protected Boolean checkClusterSSLEnabled(Boolean value) {
- if ( value.booleanValue() && (getMcastPort() != 0) ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_FALSE_WHEN_2_IS_NOT_0
- .toLocalizedString(new Object[] { CLUSTER_SSL_ENABLED, value, MCAST_PORT }));
+ if (value.booleanValue() && (getMcastPort() != 0)) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_FALSE_WHEN_2_IS_NOT_0.toLocalizedString(new Object[] {
+ CLUSTER_SSL_ENABLED, value, MCAST_PORT
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=HTTP_SERVICE_BIND_ADDRESS)
+ @ConfigAttributeChecker(name = HTTP_SERVICE_BIND_ADDRESS)
protected String checkHttpServiceBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1
- .toLocalizedString(new Object[]{value, SocketCreator.getMyAddresses()
- }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1.toLocalizedString(new Object[] {
+ value, SocketCreator.getMyAddresses()
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=DISTRIBUTED_SYSTEM_ID)
+ @ConfigAttributeChecker(name = DISTRIBUTED_SYSTEM_ID)
protected int checkDistributedSystemId(int value) {
- String distributedSystemListener = System
- .getProperty(DistributionConfig.GEMFIRE_PREFIX + "DistributedSystemListener");
+ String distributedSystemListener = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "DistributedSystemListener");
//this check is specific for Jayesh's use case of WAN BootStraping
- if(distributedSystemListener == null){
+ if (distributedSystemListener == null) {
if (value < MIN_DISTRIBUTED_SYSTEM_ID) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2
- .toLocalizedString(new Object[] { DISTRIBUTED_SYSTEM_ID,
- Integer.valueOf(value),
- Integer.valueOf(MIN_DISTRIBUTED_SYSTEM_ID) }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {
+ DISTRIBUTED_SYSTEM_ID, Integer.valueOf(value), Integer.valueOf(MIN_DISTRIBUTED_SYSTEM_ID)
+ }));
}
}
if (value > MAX_DISTRIBUTED_SYSTEM_ID) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {DISTRIBUTED_SYSTEM_ID, Integer.valueOf(value), Integer.valueOf(MAX_DISTRIBUTED_SYSTEM_ID)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {
+ DISTRIBUTED_SYSTEM_ID, Integer.valueOf(value), Integer.valueOf(MAX_DISTRIBUTED_SYSTEM_ID)
+ }));
}
return value;
}
@@ -200,20 +208,18 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
/**
* Makes sure that the locator string used to configure discovery is
* valid.
- *
+ * <p>
* <p>Starting in 4.0, we accept locators in the format
* "host:port" in addition to the traditional "host:bind-address[port]" format.
* See bug 32306.
- *
+ * <p>
* <p>Starting in 5.1.0.4, we accept locators in the format
* "host@bind-address[port]" to allow use of numeric IPv6 addresses
- *
* @return The locator string in the traditional "host:bind-address[port]"
- * format.
+ * format.
*
- * @throws IllegalArgumentException
- * If <code>value</code> is not a valid locator
- * configuration
+ * @throws IllegalArgumentException If <code>value</code> is not a valid locator
+ * configuration
*/
@ConfigAttributeChecker(name = LOCATORS)
protected String checkLocators(String value) {
@@ -244,8 +250,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
bindAddrIdx = locator.lastIndexOf(':', portIndex - 1);
}
- String host = locator.substring(0,
- bindAddrIdx > -1 ? bindAddrIdx : portIndex);
+ String host = locator.substring(0, bindAddrIdx > -1 ? bindAddrIdx : portIndex);
if (host.indexOf(':') >= 0) {
bindAddrIdx = locator.lastIndexOf('@');
@@ -275,8 +280,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
if (bindAddr.indexOf(':') >= 0) {
locatorsb.append('@');
- }
- else {
+ } else {
locatorsb.append(':');
}
locatorsb.append(bindAddr);
@@ -298,7 +302,8 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
try {
portVal = Integer.parseInt(port);
if (portVal < 1 || portVal > 65535) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_INVALID_LOCATOR_0_THE_PORT_1_WAS_NOT_GREATER_THAN_ZERO_AND_LESS_THAN_65536.toLocalizedString(new Object[] {value, Integer.valueOf(portVal)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_INVALID_LOCATOR_0_THE_PORT_1_WAS_NOT_GREATER_THAN_ZERO_AND_LESS_THAN_65536
+ .toLocalizedString(new Object[] { value, Integer.valueOf(portVal) }));
}
} catch (NumberFormatException ex) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_INVALID_LOCATOR_0.toLocalizedString(value));
@@ -313,9 +318,8 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
if (!locs.contains(sockAddr)) {
if (!firstUniqueLocator) {
sb.append(',');
- }
- else {
- firstUniqueLocator=false;
+ } else {
+ firstUniqueLocator = false;
}
locs.add(new java.net.InetSocketAddress(hostAddress, portVal));
sb.append(locatorsb);
@@ -325,119 +329,114 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
return sb.toString();
}
- /** check a new mcast flow-control setting */
- @ConfigAttributeChecker(name=MCAST_FLOW_CONTROL)
+ /**
+ * check a new mcast flow-control setting
+ */
+ @ConfigAttributeChecker(name = MCAST_FLOW_CONTROL)
protected FlowControlParams checkMcastFlowControl(FlowControlParams params) {
int value = params.getByteAllowance();
if (value < MIN_FC_BYTE_ALLOWANCE) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_BYTEALLOWANCE_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_BYTE_ALLOWANCE)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_BYTEALLOWANCE_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2
+ .toLocalizedString(new Object[] { MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_BYTE_ALLOWANCE) }));
}
float fvalue = params.getRechargeThreshold();
if (fvalue < MIN_FC_RECHARGE_THRESHOLD) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MIN_FC_RECHARGE_THRESHOLD)}));
- }
- else if (fvalue > MAX_FC_RECHARGE_THRESHOLD) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MAX_FC_RECHARGE_THRESHOLD)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2
+ .toLocalizedString(new Object[] { MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MIN_FC_RECHARGE_THRESHOLD) }));
+ } else if (fvalue > MAX_FC_RECHARGE_THRESHOLD) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2
+ .toLocalizedString(new Object[] { MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MAX_FC_RECHARGE_THRESHOLD) }));
}
value = params.getRechargeBlockMs();
if (value < MIN_FC_RECHARGE_BLOCK_MS) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_RECHARGE_BLOCK_MS)}));
- }
- else if (value > MAX_FC_RECHARGE_BLOCK_MS) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MAX_FC_RECHARGE_BLOCK_MS)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2
+ .toLocalizedString(new Object[] { MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_RECHARGE_BLOCK_MS) }));
+ } else if (value > MAX_FC_RECHARGE_BLOCK_MS) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2
+ .toLocalizedString(new Object[] { MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MAX_FC_RECHARGE_BLOCK_MS) }));
}
return params;
}
- @ConfigAttributeChecker(name=MEMBERSHIP_PORT_RANGE)
+ @ConfigAttributeChecker(name = MEMBERSHIP_PORT_RANGE)
protected int[] checkMembershipPortRange(int[] value) {
- minMaxCheck(MEMBERSHIP_PORT_RANGE, value[0],
- DEFAULT_MEMBERSHIP_PORT_RANGE[0],
- value[1]);
- minMaxCheck(MEMBERSHIP_PORT_RANGE, value[1],
- value[0],
- DEFAULT_MEMBERSHIP_PORT_RANGE[1]);
+ minMaxCheck(MEMBERSHIP_PORT_RANGE, value[0], DEFAULT_MEMBERSHIP_PORT_RANGE[0], value[1]);
+ minMaxCheck(MEMBERSHIP_PORT_RANGE, value[1], value[0], DEFAULT_MEMBERSHIP_PORT_RANGE[1]);
// Minimum 3 ports are required to start a Gemfire data node,
// One for each, UDP, FD_SOCk protocols and Cache Server.
if (value[1] - value[0] < 2) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.
- toLocalizedString(new Object[] {MEMBERSHIP_PORT_RANGE, value[0]+"-"+value[1], Integer.valueOf(3)}));
+ toLocalizedString(new Object[] {
+ MEMBERSHIP_PORT_RANGE,
+ value[0] + "-" + value[1],
+ Integer.valueOf(3)
+ }));
}
return value;
}
- /** @since GemFire 5.7 */
- @ConfigAttributeChecker(name=CLIENT_CONFLATION_PROP_NAME)
+ /**
+ * @since GemFire 5.7
+ */
+ @ConfigAttributeChecker(name = CLIENT_CONFLATION_PROP_NAME)
protected String checkClientConflation(String value) {
- if (! (value.equals(CLIENT_CONFLATION_PROP_VALUE_DEFAULT) ||
- value.equals(CLIENT_CONFLATION_PROP_VALUE_ON) ||
- value.equals(CLIENT_CONFLATION_PROP_VALUE_OFF)) ) {
+ if (!(value.equals(CLIENT_CONFLATION_PROP_VALUE_DEFAULT) ||
+ value.equals(CLIENT_CONFLATION_PROP_VALUE_ON) ||
+ value.equals(CLIENT_CONFLATION_PROP_VALUE_OFF))) {
throw new IllegalArgumentException("Could not set \"" + CONFLATE_EVENTS + "\" to \"" + value + "\" because its value is not recognized");
}
return value;
}
- @ConfigAttributeChecker(name=SECURITY_PEER_AUTH_INIT)
+ @ConfigAttributeChecker(name = SECURITY_PEER_AUTH_INIT)
protected String checkSecurityPeerAuthInit(String value) {
if (value != null && value.length() > 0 && getMcastPort() != 0) {
String mcastInfo = MCAST_PORT + "[" + getMcastPort() + "]";
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED
- .toLocalizedString(new Object[] {
- SECURITY_PEER_AUTH_INIT, value, mcastInfo }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED.toLocalizedString(new Object[] {
+ SECURITY_PEER_AUTH_INIT, value, mcastInfo
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=SECURITY_PEER_AUTHENTICATOR)
+ @ConfigAttributeChecker(name = SECURITY_PEER_AUTHENTICATOR)
protected String checkSecurityPeerAuthenticator(String value) {
if (value != null && value.length() > 0 && getMcastPort() != 0) {
String mcastInfo = MCAST_PORT + "[" + getMcastPort() + "]";
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED
- .toLocalizedString(
- new Object[] {
- SECURITY_PEER_AUTHENTICATOR,
- value,
- mcastInfo}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED.toLocalizedString(new Object[] {
+ SECURITY_PEER_AUTHENTICATOR, value, mcastInfo
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=SECURITY_LOG_LEVEL)
+ @ConfigAttributeChecker(name = SECURITY_LOG_LEVEL)
protected int checkSecurityLogLevel(int value) {
if (value < MIN_LOG_LEVEL) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(
- new Object[] {
- SECURITY_LOG_LEVEL,
- LogWriterImpl.levelToString(value),
- LogWriterImpl.levelToString(MIN_LOG_LEVEL)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {
+ SECURITY_LOG_LEVEL, LogWriterImpl.levelToString(value), LogWriterImpl.levelToString(MIN_LOG_LEVEL)
+ }));
}
if (value > MAX_LOG_LEVEL) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(
- new Object[] {
- SECURITY_LOG_LEVEL,
- LogWriterImpl.levelToString(value),
- LogWriterImpl.levelToString(MAX_LOG_LEVEL)}));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {
+ SECURITY_LOG_LEVEL, LogWriterImpl.levelToString(value), LogWriterImpl.levelToString(MAX_LOG_LEVEL)
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=MEMCACHED_PROTOCOL)
+ @ConfigAttributeChecker(name = MEMCACHED_PROTOCOL)
protected String checkMemcachedProtocol(String protocol) {
- if (protocol == null
- || (!protocol.equalsIgnoreCase(GemFireMemcachedServer.Protocol.ASCII.name()) &&
- !protocol.equalsIgnoreCase(GemFireMemcachedServer.Protocol.BINARY.name()))) {
+ if (protocol == null || (!protocol.equalsIgnoreCase(GemFireMemcachedServer.Protocol.ASCII.name()) && !protocol.equalsIgnoreCase(GemFireMemcachedServer.Protocol.BINARY
+ .name()))) {
throw new IllegalArgumentException(LocalizedStrings.
- AbstractDistributionConfig_MEMCACHED_PROTOCOL_MUST_BE_ASCII_OR_BINARY.toLocalizedString());
+ AbstractDistributionConfig_MEMCACHED_PROTOCOL_MUST_BE_ASCII_OR_BINARY.toLocalizedString());
}
return protocol;
}
@@ -446,26 +445,24 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
return false;
}
- @ConfigAttributeChecker(name=MEMCACHED_BIND_ADDRESS)
+ @ConfigAttributeChecker(name = MEMCACHED_BIND_ADDRESS)
protected String checkMemcachedBindAddress(String value) {
if (value != null && value.length() > 0 &&
!SocketCreator.isLocalHost(value)) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_MEMCACHED_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1
- .toLocalizedString(new Object[]{value, SocketCreator.getMyAddresses()
- }));
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_MEMCACHED_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1.toLocalizedString(new Object[] {
+ value, SocketCreator.getMyAddresses()
+ }));
}
return value;
}
- @ConfigAttributeChecker(name=REDIS_BIND_ADDRESS)
+ @ConfigAttributeChecker(name = REDIS_BIND_ADDRESS)
protected String checkRedisBindAddress(String value) {
if (value != null && value.length() > 0 &&
- !SocketCreator.isLocalHost(value)) {
- throw new IllegalArgumentException(
- LocalizedStrings.AbstractDistributionConfig_REDIS_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1
- .toLocalizedString(new Object[]{value, SocketCreator.getMyAddresses()
- }));
+ !SocketCreator.isLocalHost(value)) {
+ throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_REDIS_BIND_ADDRESS_0_INVALID_MUST_BE_IN_1.toLocalizedString(new Object[] {
+ value, SocketCreator.getMyAddresses()
+ }));
}
return value;
}
@@ -474,8 +471,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
@Override
protected void checkAttributeName(String attName) {
- if(!attName.startsWith(SECURITY_PREFIX) && !attName.startsWith(USERDEFINED_PREFIX_NAME)
- && !attName.startsWith(SSL_SYSTEM_PROPS_NAME) && !attName.startsWith(SYS_PROP_NAME)) {
+ if (!attName.startsWith(SECURITY_PREFIX) && !attName.startsWith(USERDEFINED_PREFIX_NAME) && !attName.startsWith(SSL_SYSTEM_PROPS_NAME) && !attName.startsWith(SYS_PROP_NAME)) {
super.checkAttributeName(attName);
}
}
@@ -490,7 +486,9 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
if (attValue != null) {
// null is a "valid" value for any class
if (!validValueClass.isInstance(attValue)) {
- throw new InvalidValueException(LocalizedStrings.AbstractDistributionConfig_0_VALUE_1_MUST_BE_OF_TYPE_2.toLocalizedString(new Object[]{attName, attValue, validValueClass.getName()}));
+ throw new InvalidValueException(LocalizedStrings.AbstractDistributionConfig_0_VALUE_1_MUST_BE_OF_TYPE_2.toLocalizedString(new Object[] {
+ attName, attValue, validValueClass.getName()
+ }));
}
}
@@ -500,14 +498,14 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
}
// special case: log-level and security-log-level attributes are String type, but the setter accepts int
- if(attName.equalsIgnoreCase(LOG_LEVEL) || attName.equalsIgnoreCase(SECURITY_LOG_LEVEL)){
- if(attValue instanceof String) {
+ if (attName.equalsIgnoreCase(LOG_LEVEL) || attName.equalsIgnoreCase(SECURITY_LOG_LEVEL)) {
+ if (attValue instanceof String) {
attValue = LogWriterImpl.levelNameToCode((String) attValue);
}
}
if (attName.startsWith(SECURITY_PREFIX)) {
- this.setSecurity(attName,attValue.toString());
+ this.setSecurity(attName, attValue.toString());
}
if (attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME)) {
@@ -519,8 +517,8 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
// if we cann't find the defined setter, but the attributeName starts with these special characters
// since we already set it in the respecitive properties above, we need to set the source then return
if (attName.startsWith(SECURITY_PREFIX) ||
- attName.startsWith(SSL_SYSTEM_PROPS_NAME) ||
- attName.startsWith(SYS_PROP_NAME)) {
+ attName.startsWith(SSL_SYSTEM_PROPS_NAME) ||
+ attName.startsWith(SYS_PROP_NAME)) {
getAttSourceMap().put(attName, source);
return;
}
@@ -528,21 +526,22 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
}
Class[] pTypes = setter.getParameterTypes();
- if (pTypes.length != 1)
+ if (pTypes.length != 1) {
throw new InternalGemFireException("the attribute setter must have one and only one parametter");
+ }
try {
setter.invoke(this, attValue);
} catch (Exception e) {
- if(e instanceof RuntimeException){
- throw (RuntimeException)e;
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException) e;
}
- if(e.getCause() instanceof RuntimeException){
- throw (RuntimeException)e.getCause();
+ if (e.getCause() instanceof RuntimeException) {
+ throw (RuntimeException) e.getCause();
+ } else {
+ throw new InternalGemFireException("error invoking " + setter.getName() + " with " + attValue, e);
}
- else
- throw new InternalGemFireException("error invoking "+setter.getName()+" with "+attValue, e);
}
getAttSourceMap().put(attName, source);
@@ -561,7 +560,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
}
Method getter = getters.get(attName);
- if(getter==null) {
+ if (getter == null) {
if (attName.startsWith(SECURITY_PREFIX)) {
return this.getSecurity(attName);
}
@@ -571,25 +570,27 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
try {
return getter.invoke(this);
} catch (Exception e) {
- if(e instanceof RuntimeException){
- throw (RuntimeException)e;
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException) e;
}
- if(e.getCause() instanceof RuntimeException){
- throw (RuntimeException)e.getCause();
- }
- else
+ if (e.getCause() instanceof RuntimeException) {
+ throw (RuntimeException) e.getCause();
+ } else {
throw new InternalGemFireException("error invoking " + getter.getName(), e);
+ }
}
}
public boolean isAttributeModifiable(String attName) {
checkAttributeName(attName);
- if(getModifiableAttributes().contains(attName))
+ if (getModifiableAttributes().contains(attName)) {
return true;
+ }
- if(getUnModifiableAttributes().contains(attName))
+ if (getUnModifiableAttributes().contains(attName)) {
return false;
+ }
// otherwise, return the default
return _modifiableDefault();
}
@@ -599,21 +600,25 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
* child class can override this method to return a list of modifiable attributes
* no matter what the default is
* @return an empty list
- */
- public List<String> getModifiableAttributes(){
- String[] modifiables = {HTTP_SERVICE_PORT,JMX_MANAGER_HTTP_PORT};
+ */
+ public List<String> getModifiableAttributes() {
+ String[] modifiables = { HTTP_SERVICE_PORT, JMX_MANAGER_HTTP_PORT };
return Arrays.asList(modifiables);
- };
+ }
+
+ ;
/**
* child class can override this method to return a list of unModifiable attributes
* no matter what the default is
* @return an empty list
*/
- public List<String> getUnModifiableAttributes(){
+ public List<String> getUnModifiableAttributes() {
String[] list = {};
return Arrays.asList(list);
- };
+ }
+
+ ;
public Class getAttributeType(String attName) {
checkAttributeName(attName);
@@ -622,8 +627,8 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
public static Class _getAttributeType(String attName) {
ConfigAttribute ca = attributes.get(attName);
- if(ca==null){
- if(attName.startsWith(SECURITY_PREFIX) || attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME) ){
+ if (ca == null) {
+ if (attName.startsWith(SECURITY_PREFIX) || attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME)) {
return String.class;
}
throw new InternalGemFireException(LocalizedStrings.AbstractDistributionConfig_UNHANDLED_ATTRIBUTE_NAME_0.toLocalizedString(attName));
@@ -632,349 +637,216 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
}
protected static final Map dcAttDescriptions;
+
static {
- Map<String, String> m = new HashMap<String, String>();
-
- m.put(ACK_WAIT_THRESHOLD,
- LocalizedStrings.AbstractDistributionConfig_DEFAULT_ACK_WAIT_THRESHOLD_0_1_2
- .toLocalizedString( new Object[] {
- Integer.valueOf(DEFAULT_ACK_WAIT_THRESHOLD),
- Integer.valueOf(MIN_ACK_WAIT_THRESHOLD),
- Integer.valueOf(MIN_ACK_WAIT_THRESHOLD)}));
-
- m.put(ARCHIVE_FILE_SIZE_LIMIT,
- LocalizedStrings.AbstractDistributionConfig_ARCHIVE_FILE_SIZE_LIMIT_NAME
- .toLocalizedString());
-
- m.put(ACK_SEVERE_ALERT_THRESHOLD,
- LocalizedStrings.AbstractDistributionConfig_ACK_SEVERE_ALERT_THRESHOLD_NAME
- .toLocalizedString(
- new Object[] { ACK_WAIT_THRESHOLD,
- Integer.valueOf(DEFAULT_ACK_SEVERE_ALERT_THRESHOLD),
- Integer.valueOf(MIN_ACK_SEVERE_ALERT_THRESHOLD),
- Integer.valueOf(MAX_ACK_SEVERE_ALERT_THRESHOLD)}));
-
- m.put(ARCHIVE_DISK_SPACE_LIMIT,
- LocalizedStrings.AbstractDistributionConfig_ARCHIVE_DISK_SPACE_LIMIT_NAME
- .toLocalizedString());
-
- m.put(CACHE_XML_FILE,
- LocalizedStrings.AbstractDistributionConfig_CACHE_XML_FILE_NAME_0
- .toLocalizedString( DEFAULT_CACHE_XML_FILE ));
-
- m.put(DISABLE_TCP,
- LocalizedStrings.AbstractDistributionConfig_DISABLE_TCP_NAME_0
- .toLocalizedString(Boolean.valueOf(DEFAULT_DISABLE_TCP)));
-
- m.put(ENABLE_TIME_STATISTICS,
- LocalizedStrings.AbstractDistributionConfig_ENABLE_TIME_STATISTICS_NAME
- .toLocalizedString());
-
- m.put(DEPLOY_WORKING_DIR,
- LocalizedStrings.AbstractDistributionConfig_DEPLOY_WORKING_DIR_0
- .toLocalizedString(DEFAULT_DEPLOY_WORKING_DIR));
-
- m.put(LOG_FILE,
- LocalizedStrings.AbstractDistributionConfig_LOG_FILE_NAME_0
- .toLocalizedString(DEFAULT_LOG_FILE));
-
- m.put(LOG_LEVEL,
- LocalizedStrings.AbstractDistributionConfig_LOG_LEVEL_NAME_0_1
- .toLocalizedString(new Object[] { LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL), LogWriterImpl.allowedLogLevels()}));
-
- m.put(LOG_FILE_SIZE_LIMIT,
- LocalizedStrings.AbstractDistributionConfig_LOG_FILE_SIZE_LIMIT_NAME
- .toLocalizedString());
-
- m.put(LOG_DISK_SPACE_LIMIT,
- LocalizedStrings.AbstractDistributionConfig_LOG_DISK_SPACE_LIMIT_NAME
- .toLocalizedString());
-
- m.put(LOCATORS,
- LocalizedStrings.AbstractDistributionConfig_LOCATORS_NAME_0
- .toLocalizedString(DEFAULT_LOCATORS));
-
- m.put(LOCATOR_WAIT_TIME,
- LocalizedStrings.AbstractDistributionConfig_LOCATOR_WAIT_TIME_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_LOCATOR_WAIT_TIME)));
-
- m.put(TCP_PORT,
- LocalizedStrings.AbstractDistributionConfig_TCP_PORT_NAME_0_1_2
- .toLocalizedString( new Object[] {
- Integer.valueOf(DEFAULT_TCP_PORT),
- Integer.valueOf(MIN_TCP_PORT),
- Integer.valueOf(MAX_TCP_PORT)}));
-
- m.put(MCAST_PORT,
- LocalizedStrings.AbstractDistributionConfig_MCAST_PORT_NAME_0_1_2
- .toLocalizedString(new Object[] {
- Integer.valueOf(DEFAULT_MCAST_PORT),
- Integer.valueOf(MIN_MCAST_PORT),
- Integer.valueOf(MAX_MCAST_PORT)}));
-
- m.put(MCAST_ADDRESS,
- LocalizedStrings.AbstractDistributionConfig_MCAST_ADDRESS_NAME_0_1
- .toLocalizedString(new Object[] {
- Integer.valueOf(DEFAULT_MCAST_PORT),
- DEFAULT_MCAST_ADDRESS}));
-
- m.put(MCAST_TTL,
- LocalizedStrings.AbstractDistributionConfig_MCAST_TTL_NAME_0_1_2
- .toLocalizedString(new Object[] {
- Integer.valueOf(DEFAULT_MCAST_TTL),
- Integer.valueOf(MIN_MCAST_TTL),
- Integer.valueOf(MAX_MCAST_TTL)}));
-
- m.put(MCAST_SEND_BUFFER_SIZE,
- LocalizedStrings.AbstractDistributionConfig_MCAST_SEND_BUFFER_SIZE_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_MCAST_SEND_BUFFER_SIZE)));
-
- m.put(MCAST_RECV_BUFFER_SIZE,
- LocalizedStrings.AbstractDistributionConfig_MCAST_RECV_BUFFER_SIZE_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_MCAST_RECV_BUFFER_SIZE)));
-
- m.put(MCAST_FLOW_CONTROL,
- LocalizedStrings.AbstractDistributionConfig_MCAST_FLOW_CONTROL_NAME_0
- .toLocalizedString(DEFAULT_MCAST_FLOW_CONTROL));
-
- m.put(MEMBER_TIMEOUT,
- LocalizedStrings.AbstractDistributionConfig_MEMBER_TIMEOUT_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_MEMBER_TIMEOUT)));
-
+ Map<String, String> m = new HashMap<String, String>();
+
+ m.put(ACK_WAIT_THRESHOLD, LocalizedStrings.AbstractDistributionConfig_DEFAULT_ACK_WAIT_THRESHOLD_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_ACK_WAIT_THRESHOLD), Integer.valueOf(MIN_ACK_WAIT_THRESHOLD), Integer.valueOf(MIN_ACK_WAIT_THRESHOLD)
+ }));
+
+ m.put(ARCHIVE_FILE_SIZE_LIMIT, LocalizedStrings.AbstractDistributionConfig_ARCHIVE_FILE_SIZE_LIMIT_NAME.toLocalizedString());
+
+ m.put(ACK_SEVERE_ALERT_THRESHOLD, LocalizedStrings.AbstractDistributionConfig_ACK_SEVERE_ALERT_THRESHOLD_NAME.toLocalizedString(new Object[] {
+ ACK_WAIT_THRESHOLD,
+ Integer.valueOf(DEFAULT_ACK_SEVERE_ALERT_THRESHOLD),
+ Integer.valueOf(MIN_ACK_SEVERE_ALERT_THRESHOLD),
+ Integer.valueOf(MAX_ACK_SEVERE_ALERT_THRESHOLD)
+ }));
+
+ m.put(ARCHIVE_DISK_SPACE_LIMIT, LocalizedStrings.AbstractDistributionConfig_ARCHIVE_DISK_SPACE_LIMIT_NAME.toLocalizedString());
+
+ m.put(CACHE_XML_FILE, LocalizedStrings.AbstractDistributionConfig_CACHE_XML_FILE_NAME_0.toLocalizedString(DEFAULT_CACHE_XML_FILE));
+
+ m.put(DISABLE_TCP, LocalizedStrings.AbstractDistributionConfig_DISABLE_TCP_NAME_0.toLocalizedString(Boolean.valueOf(DEFAULT_DISABLE_TCP)));
+
+ m.put(ENABLE_TIME_STATISTICS, LocalizedStrings.AbstractDistributionConfig_ENABLE_TIME_STATISTICS_NAME.toLocalizedString());
+
+ m.put(DEPLOY_WORKING_DIR, LocalizedStrings.AbstractDistributionConfig_DEPLOY_WORKING_DIR_0.toLocalizedString(DEFAULT_DEPLOY_WORKING_DIR));
+
+ m.put(LOG_FILE, LocalizedStrings.AbstractDistributionConfig_LOG_FILE_NAME_0.toLocalizedString(DEFAULT_LOG_FILE));
+
+ m.put(LOG_LEVEL, LocalizedStrings.AbstractDistributionConfig_LOG_LEVEL_NAME_0_1.toLocalizedString(new Object[] {
+ LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL), LogWriterImpl.allowedLogLevels()
+ }));
+
+ m.put(LOG_FILE_SIZE_LIMIT, LocalizedStrings.AbstractDistributionConfig_LOG_FILE_SIZE_LIMIT_NAME.toLocalizedString());
+
+ m.put(LOG_DISK_SPACE_LIMIT, LocalizedStrings.AbstractDistributionConfig_LOG_DISK_SPACE_LIMIT_NAME.toLocalizedString());
+
+ m.put(LOCATORS, LocalizedStrings.AbstractDistributionConfig_LOCATORS_NAME_0.toLocalizedString(DEFAULT_LOCATORS));
+
+ m.put(LOCATOR_WAIT_TIME, LocalizedStrings.AbstractDistributionConfig_LOCATOR_WAIT_TIME_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_LOCATOR_WAIT_TIME)));
+
+ m.put(TCP_PORT, LocalizedStrings.AbstractDistributionConfig_TCP_PORT_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_TCP_PORT), Integer.valueOf(MIN_TCP_PORT), Integer.valueOf(MAX_TCP_PORT)
+ }));
+
+ m.put(MCAST_PORT, LocalizedStrings.AbstractDistributionConfig_MCAST_PORT_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_MCAST_PORT), Integer.valueOf(MIN_MCAST_PORT), Integer.valueOf(MAX_MCAST_PORT)
+ }));
+
+ m.put(MCAST_ADDRESS, LocalizedStrings.AbstractDistributionConfig_MCAST_ADDRESS_NAME_0_1.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_MCAST_PORT), DEFAULT_MCAST_ADDRESS
+ }));
+
+ m.put(MCAST_TTL, LocalizedStrings.AbstractDistributionConfig_MCAST_TTL_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_MCAST_TTL), Integer.valueOf(MIN_MCAST_TTL), Integer.valueOf(MAX_MCAST_TTL)
+ }));
+
+ m.put(MCAST_SEND_BUFFER_SIZE, LocalizedStrings.AbstractDistributionConfig_MCAST_SEND_BUFFER_SIZE_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_MCAST_SEND_BUFFER_SIZE)));
+
+ m.put(MCAST_RECV_BUFFER_SIZE, LocalizedStrings.AbstractDistributionConfig_MCAST_RECV_BUFFER_SIZE_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_MCAST_RECV_BUFFER_SIZE)));
+
+ m.put(MCAST_FLOW_CONTROL, LocalizedStrings.AbstractDistributionConfig_MCAST_FLOW_CONTROL_NAME_0.toLocalizedString(DEFAULT_MCAST_FLOW_CONTROL));
+
+ m.put(MEMBER_TIMEOUT, LocalizedStrings.AbstractDistributionConfig_MEMBER_TIMEOUT_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_MEMBER_TIMEOUT)));
+
// for some reason the default port range is null under some circumstances
int[] range = DEFAULT_MEMBERSHIP_PORT_RANGE;
- String srange = range==null? "not available" : "" + range[0] + "-" + range[1];
- String msg = LocalizedStrings.AbstractDistributionConfig_MEMBERSHIP_PORT_RANGE_NAME_0
- .toLocalizedString(srange);
- m.put(MEMBERSHIP_PORT_RANGE,
- msg);
-
- m.put(UDP_SEND_BUFFER_SIZE,
- LocalizedStrings.AbstractDistributionConfig_UDP_SEND_BUFFER_SIZE_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_UDP_SEND_BUFFER_SIZE)));
-
- m.put(UDP_RECV_BUFFER_SIZE,
- LocalizedStrings.AbstractDistributionConfig_UDP_RECV_BUFFER_SIZE_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_UDP_RECV_BUFFER_SIZE)));
-
- m.put(UDP_FRAGMENT_SIZE,
- LocalizedStrings.AbstractDistributionConfig_UDP_FRAGMENT_SIZE_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_UDP_FRAGMENT_SIZE)));
-
- m.put(SOCKET_LEASE_TIME,
- LocalizedStrings.AbstractDistributionConfig_SOCKET_LEASE_TIME_NAME_0_1_2
- .toLocalizedString(new Object[] {
- Integer.valueOf(DEFAULT_SOCKET_LEASE_TIME),
- Integer.valueOf(MIN_SOCKET_LEASE_TIME),
- Integer.valueOf(MAX_SOCKET_LEASE_TIME)}));
-
- m.put(SOCKET_BUFFER_SIZE,
- LocalizedStrings.AbstractDistributionConfig_SOCKET_BUFFER_SIZE_NAME_0_1_2
- .toLocalizedString(new Object[] {
- Integer.valueOf(DEFAULT_SOCKET_BUFFER_SIZE),
- Integer.valueOf(MIN_SOCKET_BUFFER_SIZE),
- Integer.valueOf(MAX_SOCKET_BUFFER_SIZE)}));
-
- m.put(CONSERVE_SOCKETS,
- LocalizedStrings.AbstractDistributionConfig_CONSERVE_SOCKETS_NAME_0
- .toLocalizedString(Boolean.valueOf(DEFAULT_CONSERVE_SOCKETS)));
-
- m.put(ROLES,
- LocalizedStrings.AbstractDistributionConfig_ROLES_NAME_0
- .toLocalizedString(DEFAULT_ROLES));
-
- m.put(BIND_ADDRESS,
- LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_NAME_0
- .toLocalizedString(DEFAULT_BIND_ADDRESS));
-
- m.put(SERVER_BIND_ADDRESS,
- LocalizedStrings.AbstractDistributionConfig_SERVER_BIND_ADDRESS_NAME_0
- .toLocalizedString(DEFAULT_BIND_ADDRESS));
+ String srange = range == null ? "not available" : "" + range[0] + "-" + range[1];
+ String msg = LocalizedStrings.AbstractDistributionConfig_MEMBERSHIP_PORT_RANGE_NAME_0.toLocalizedString(srange);
+ m.put(MEMBERSHIP_PORT_RANGE, msg);
+
+ m.put(UDP_SEND_BUFFER_SIZE, LocalizedStrings.AbstractDistributionConfig_UDP_SEND_BUFFER_SIZE_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_UDP_SEND_BUFFER_SIZE)));
+
+ m.put(UDP_RECV_BUFFER_SIZE, LocalizedStrings.AbstractDistributionConfig_UDP_RECV_BUFFER_SIZE_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_UDP_RECV_BUFFER_SIZE)));
+
+ m.put(UDP_FRAGMENT_SIZE, LocalizedStrings.AbstractDistributionConfig_UDP_FRAGMENT_SIZE_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_UDP_FRAGMENT_SIZE)));
+
+ m.put(SOCKET_LEASE_TIME, LocalizedStrings.AbstractDistributionConfig_SOCKET_LEASE_TIME_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_SOCKET_LEASE_TIME), Integer.valueOf(MIN_SOCKET_LEASE_TIME), Integer.valueOf(MAX_SOCKET_LEASE_TIME)
+ }));
+
+ m.put(SOCKET_BUFFER_SIZE, LocalizedStrings.AbstractDistributionConfig_SOCKET_BUFFER_SIZE_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_SOCKET_BUFFER_SIZE), Integer.valueOf(MIN_SOCKET_BUFFER_SIZE), Integer.valueOf(MAX_SOCKET_BUFFER_SIZE)
+ }));
+
+ m.put(CONSERVE_SOCKETS, LocalizedStrings.AbstractDistributionConfig_CONSERVE_SOCKETS_NAME_0.toLocalizedString(Boolean.valueOf(DEFAULT_CONSERVE_SOCKETS)));
+
+ m.put(ROLES, LocalizedStrings.AbstractDistributionConfig_ROLES_NAME_0.toLocalizedString(DEFAULT_ROLES));
+
+ m.put(BIND_ADDRESS, LocalizedStrings.AbstractDistributionConfig_BIND_ADDRESS_NAME_0.toLocalizedString(DEFAULT_BIND_ADDRESS));
+
+ m.put(SERVER_BIND_ADDRESS, LocalizedStrings.AbstractDistributionConfig_SERVER_BIND_ADDRESS_NAME_0.toLocalizedString(DEFAULT_BIND_ADDRESS));
m.put(NAME, "A name that uniquely identifies a member in its distributed system." +
- " Multiple members in the same distributed system can not have the same name." +
- " Defaults to \"\".");
-
- m.put(STATISTIC_ARCHIVE_FILE,
- LocalizedStrings.AbstractDistributionConfig_STATISTIC_ARCHIVE_FILE_NAME_0
- .toLocalizedString(DEFAULT_STATISTIC_ARCHIVE_FILE));
-
- m.put(STATISTIC_SAMPLE_RATE,
- LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLE_RATE_NAME_0_1_2
- .toLocalizedString(new Object[] {
- Integer.valueOf(DEFAULT_STATISTIC_SAMPLE_RATE),
- Integer.valueOf(MIN_STATISTIC_SAMPLE_RATE),
- Integer.valueOf(MAX_STATISTIC_SAMPLE_RATE)}));
-
- m.put(STATISTIC_SAMPLING_ENABLED,
- LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLING_ENABLED_NAME_0
- .toLocalizedString(
- Boolean.valueOf(DEFAULT_STATISTIC_SAMPLING_ENABLED)));
-
- m.put(CLUSTER_SSL_ENABLED,
- LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
- .toLocalizedString(
- Boolean.valueOf(DEFAULT_CLUSTER_SSL_ENABLED)));
-
- m.put(CLUSTER_SSL_PROTOCOLS,
- LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
- .toLocalizedString(DEFAULT_CLUSTER_SSL_PROTOCOLS));
-
- m.put(CLUSTER_SSL_CIPHERS,
- LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
- .toLocalizedString(DEFAULT_CLUSTER_SSL_CIPHERS));
-
- m.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION,
- LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
- .toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION)));
-
- m.put(CLUSTER_SSL_KEYSTORE,"Location of the Java keystore file containing an distributed member's own certificate and private key.");
-
- m.put(CLUSTER_SSL_KEYSTORE_TYPE,
- "For Java keystore file format, this property has the value jks (or JKS).");
-
- m.put(CLUSTER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
-
- m.put(CLUSTER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by distributed member (trust store).");
-
- m.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
-
- m.put(MAX_WAIT_TIME_RECONNECT,
- LocalizedStrings.AbstractDistributionConfig_MAX_WAIT_TIME_FOR_RECONNECT
- .toLocalizedString());
-
- m.put(MAX_NUM_RECONNECT_TRIES,
- LocalizedStrings.AbstractDistributionConfig_MAX_NUM_RECONNECT_TRIES
- .toLocalizedString());
-
- m.put(ASYNC_DISTRIBUTION_TIMEOUT,
- LocalizedStrings.AbstractDistributionConfig_ASYNC_DISTRIBUTION_TIMEOUT_NAME_0_1_2
- .toLocalizedString( new Object[] {
- Integer.valueOf(DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT),
- Integer.valueOf(MIN_ASYNC_DISTRIBUTION_TIMEOUT),
- Integer.valueOf(MAX_ASYNC_DISTRIBUTION_TIMEOUT)}));
-
-
- m.put(ASYNC_QUEUE_TIMEOUT,
- LocalizedStrings.AbstractDistributionConfig_ASYNC_QUEUE_TIMEOUT_NAME_0_1_2
- .toLocalizedString( new Object[] {
- Integer.valueOf(DEFAULT_ASYNC_QUEUE_TIMEOUT),
- Integer.valueOf(MIN_ASYNC_QUEUE_TIMEOUT),
- Integer.valueOf(MAX_ASYNC_QUEUE_TIMEOUT)}));
-
- m.put(ASYNC_MAX_QUEUE_SIZE,
- LocalizedStrings.AbstractDistributionConfig_ASYNC_MAX_QUEUE_SIZE_NAME_0_1_2
- .toLocalizedString( new Object[] {
- Integer.valueOf(DEFAULT_ASYNC_MAX_QUEUE_SIZE),
- Integer.valueOf(MIN_ASYNC_MAX_QUEUE_SIZE),
- Integer.valueOf(MAX_ASYNC_MAX_QUEUE_SIZE) }));
-
- m.put(START_LOCATOR,
- LocalizedStrings.AbstractDistributionConfig_START_LOCATOR_NAME
- .toLocalizedString());
-
- m.put(DURABLE_CLIENT_ID,
- LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_ID_NAME_0
- .toLocalizedString(DEFAULT_DURABLE_CLIENT_ID));
-
- m.put(CONFLATE_EVENTS,
- LocalizedStrings.AbstractDistributionConfig_CLIENT_CONFLATION_PROP_NAME
- .toLocalizedString());
-
- m.put(DURABLE_CLIENT_TIMEOUT,
- LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_TIMEOUT_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_DURABLE_CLIENT_TIMEOUT)));
-
- m.put(SECURITY_CLIENT_AUTH_INIT,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTH_INIT_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTH_INIT));
-
+ " Multiple members in the same distributed system can not have the same name." +
+ " Defaults to \"\".");
+
+ m.put(STATISTIC_ARCHIVE_FILE, LocalizedStrings.AbstractDistributionConfig_STATISTIC_ARCHIVE_FILE_NAME_0.toLocalizedString(DEFAULT_STATISTIC_ARCHIVE_FILE));
+
+ m.put(STATISTIC_SAMPLE_RATE, LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLE_RATE_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_STATISTIC_SAMPLE_RATE), Integer.valueOf(MIN_STATISTIC_SAMPLE_RATE), Integer.valueOf(MAX_STATISTIC_SAMPLE_RATE)
+ }));
+
+ m.put(STATISTIC_SAMPLING_ENABLED, LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLING_ENABLED_NAME_0.toLocalizedString(Boolean.valueOf(DEFAULT_STATISTIC_SAMPLING_ENABLED)));
+
+ m.put(CLUSTER_SSL_ALIAS, LocalizedStrings.AbstractDistributionConfig_CLUSTER_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_ALIAS)));
+
+ m.put(CLUSTER_SSL_ENABLED, LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_ENABLED)));
+
+ m.put(CLUSTER_SSL_PROTOCOLS, LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0.toLocalizedString(DEFAULT_CLUSTER_SSL_PROTOCOLS));
+
+ m.put(CLUSTER_SSL_CIPHERS, LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0.toLocalizedString(DEFAULT_CLUSTER_SSL_CIPHERS));
+
+ m.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION)));
+
+ m.put(CLUSTER_SSL_KEYSTORE, "Location of the Java keystore file containing an distributed member's own certificate and private key.");
+
+ m.put(CLUSTER_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
+
+ m.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+
+ m.put(CLUSTER_SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of CA certificates trusted by distributed member (trust store).");
+
+ m.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+
+ m.put(MAX_WAIT_TIME_RECONNECT, LocalizedStrings.AbstractDistributionConfig_MAX_WAIT_TIME_FOR_RECONNECT.toLocalizedString());
+
+ m.put(MAX_NUM_RECONNECT_TRIES, LocalizedStrings.AbstractDistributionConfig_MAX_NUM_RECONNECT_TRIES.toLocalizedString());
+
+ m.put(ASYNC_DISTRIBUTION_TIMEOUT, LocalizedStrings.AbstractDistributionConfig_ASYNC_DISTRIBUTION_TIMEOUT_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT), Integer.valueOf(MIN_ASYNC_DISTRIBUTION_TIMEOUT), Integer.valueOf(MAX_ASYNC_DISTRIBUTION_TIMEOUT)
+ }));
+
+
+ m.put(ASYNC_QUEUE_TIMEOUT, LocalizedStrings.AbstractDistributionConfig_ASYNC_QUEUE_TIMEOUT_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_ASYNC_QUEUE_TIMEOUT), Integer.valueOf(MIN_ASYNC_QUEUE_TIMEOUT), Integer.valueOf(MAX_ASYNC_QUEUE_TIMEOUT)
+ }));
+
+ m.put(ASYNC_MAX_QUEUE_SIZE, LocalizedStrings.AbstractDistributionConfig_ASYNC_MAX_QUEUE_SIZE_NAME_0_1_2.toLocalizedString(new Object[] {
+ Integer.valueOf(DEFAULT_ASYNC_MAX_QUEUE_SIZE), Integer.valueOf(MIN_ASYNC_MAX_QUEUE_SIZE), Integer.valueOf(MAX_ASYNC_MAX_QUEUE_SIZE)
+ }));
+
+ m.put(START_LOCATOR, LocalizedStrings.AbstractDistributionConfig_START_LOCATOR_NAME.toLocalizedString());
+
+ m.put(DURABLE_CLIENT_ID, LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_ID_NAME_0.toLocalizedString(DEFAULT_DURABLE_CLIENT_ID));
+
+ m.put(CONFLATE_EVENTS, LocalizedStrings.AbstractDistributionConfig_CLIENT_CONFLATION_PROP_NAME.toLocalizedString());
+
+ m.put(DURABLE_CLIENT_TIMEOUT, LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_TIMEOUT_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_DURABLE_CLIENT_TIMEOUT)));
+
+ m.put(SECURITY_CLIENT_AUTH_INIT, LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTH_INIT_NAME_0.toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTH_INIT));
+
m.put(ENABLE_NETWORK_PARTITION_DETECTION, "Whether network partitioning detection is enabled");
-
+
m.put(DISABLE_AUTO_RECONNECT, "Whether auto reconnect is attempted after a network partition");
- m.put(SECURITY_CLIENT_AUTHENTICATOR,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTHENTICATOR_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTHENTICATOR));
+ m.put(SECURITY_CLIENT_AUTHENTICATOR, LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTHENTICATOR_NAME_0.toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTHENTICATOR));
- m.put(SECURITY_CLIENT_DHALGO,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_CLIENT_DHALGO));
+ m.put(SECURITY_CLIENT_DHALGO, LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0.toLocalizedString(DEFAULT_SECURITY_CLIENT_DHALGO));
- m.put(SECURITY_PEER_AUTH_INIT,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTH_INIT_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_PEER_AUTH_INIT));
+ m.put(SECURITY_PEER_AUTH_INIT, LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTH_INIT_NAME_0.toLocalizedString(DEFAULT_SECURITY_PEER_AUTH_INIT));
- m.put(SECURITY_PEER_AUTHENTICATOR,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTHENTICATOR_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_PEER_AUTHENTICATOR));
+ m.put(SECURITY_PEER_AUTHENTICATOR, LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTHENTICATOR_NAME_0.toLocalizedString(DEFAULT_SECURITY_PEER_AUTHENTICATOR));
- m.put(SECURITY_CLIENT_ACCESSOR,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR));
+ m.put(SECURITY_CLIENT_ACCESSOR, LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_NAME_0.toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR));
- m.put(SECURITY_CLIENT_ACCESSOR_PP,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_PP_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR_PP));
+ m.put(SECURITY_CLIENT_ACCESSOR_PP, LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_PP_NAME_0.toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR_PP));
- m.put(SECURITY_LOG_LEVEL,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_LEVEL_NAME_0_1
- .toLocalizedString( new Object[] {
- LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL),
- LogWriterImpl.allowedLogLevels()}));
+ m.put(SECURITY_LOG_LEVEL, LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_LEVEL_NAME_0_1.toLocalizedString(new Object[] {
+ LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL), LogWriterImpl.allowedLogLevels()
+ }));
- m.put(SECURITY_LOG_FILE,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_FILE_NAME_0
- .toLocalizedString(DEFAULT_SECURITY_LOG_FILE));
+ m.put(SECURITY_LOG_FILE, LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_FILE_NAME_0.toLocalizedString(DEFAULT_SECURITY_LOG_FILE));
- m.put(SECURITY_PEER_VERIFY_MEMBER_TIMEOUT,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME_0
- .toLocalizedString(Integer.valueOf(DEFAULT_SECURITY_PEER_VERIFYMEMBER_TIMEOUT)));
+ m.put(SECURITY_PEER_VERIFY_MEMBER_TIMEOUT, LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME_0.toLocalizedString(Integer.valueOf(DEFAULT_SECURITY_PEER_VERIFYMEMBER_TIMEOUT)));
- m.put(SECURITY_PREFIX,
- LocalizedStrings.AbstractDistributionConfig_SECURITY_PREFIX_NAME
- .toLocalizedString());
+ m.put(SECURITY_PREFIX, LocalizedStrings.AbstractDistributionConfig_SECURITY_PREFIX_NAME.toLocalizedString());
- m.put(USERDEFINED_PREFIX_NAME,
- LocalizedStrings.AbstractDistributionConfig_USERDEFINED_PREFIX_NAME
- .toLocalizedString());
+ m.put(USERDEFINED_PREFIX_NAME, LocalizedStrings.AbstractDistributionConfig_USERDEFINED_PREFIX_NAME.toLocalizedString());
- m.put(REMOVE_UNRESPONSIVE_CLIENT,
- LocalizedStrings.AbstractDistributionConfig_REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME_0
- .toLocalizedString(DEFAULT_REMOVE_UNRESPONSIVE_CLIENT));
+ m.put(REMOVE_UNRESPONSIVE_CLIENT, LocalizedStrings.AbstractDistributionConfig_REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME_0.toLocalizedString(DEFAULT_REMOVE_UNRESPONSIVE_CLIENT));
m.put(DELTA_PROPAGATION, "Whether delta propagation is enabled");
-
- m.put(REMOTE_LOCATORS,
- LocalizedStrings.AbstractDistributionConfig_REMOTE_DISTRIBUTED_SYSTEMS_NAME_0
- .toLocalizedString(DEFAULT_REMOTE_LOCATORS));
+
+ m.put(REMOTE_LOCATORS, LocalizedStrings.AbstractDistributionConfig_REMOTE_DISTRIBUTED_SYSTEMS_NAME_0.toLocalizedString(DEFAULT_REMOTE_LOCATORS));
m.put(DISTRIBUTED_SYSTEM_ID, "An id that uniquely idenitifies this distributed system. " +
- "Required when using portable data exchange objects and the WAN." +
- "Must be the same on each member in this distributed system if set.");
- m.put(ENFORCE_UNIQUE_HOST, "Whether to require partitioned regions to put " +
- "redundant copies of data on different physical machines");
-
- m.put(REDUNDANCY_ZONE, "The zone that this member is in. When this is set, " +
- "partitioned regions will not put two copies of the same data in the same zone.");
-
- m.put(GROUPS, "A comma separated list of all the groups this member belongs to." +
- " Defaults to \"\".");
-
+ "Required when using portable data exchange objects and the WAN." +
+ "Must be the same on each member in this distributed system if set.");
+ m.put(ENFORCE_UNIQUE_HOST, "Whether to require partitioned regions to put " + "redundant copies of data on different physical machines");
+
+ m.put(REDUNDANCY_ZONE, "The zone that this member is in. When this is set, " + "partitioned regions will not put two copies of the same data in the same zone.");
+
+ m.put(GROUPS, "A comma separated list of all the groups this member belongs to." + " Defaults to \"\".");
+
m.put(USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
-
+
m.put(JMX_MANAGER, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
m.put(JMX_MANAGER_START, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
m.put(JMX_MANAGER_SSL_ENABLED, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
- m.put(JMX_MANAGER_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_CIPHERS+"\" meaning your provider''s defaults.");
- m.put(JMX_MANAGER_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_PROTOCOLS+"\" meaning defaults of your provider.");
- m.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous JMX Clients are allowed. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION+"\".");
- m.put(JMX_MANAGER_SSL_KEYSTORE,"Location of the Java keystore file containing jmx manager's own certificate and private key.");
+ m.put(JMX_MANAGER_SSL_ALIAS, LocalizedStrings.AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_ALIAS)));
+ m.put(JMX_MANAGER_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for JMX Manager. Defaults to \"" + DEFAULT_JMX_MANAGER_SSL_CIPHERS + "\" meaning your provider''s defaults.");
+ m.put(JMX_MANAGER_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for JMX Manager. Defaults to \"" + DEFAULT_JMX_MANAGER_SSL_PROTOCOLS + "\" meaning defaults of your provider.");
+ m.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous JMX Clients are allowed. Defaults to \"" + DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION + "\".");
+ m.put(JMX_MANAGER_SSL_KEYSTORE, "Location of the Java keystore file containing jmx manager's own certificate and private key.");
m.put(JMX_MANAGER_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
- m.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
- m.put(JMX_MANAGER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by jmx manager.");
- m.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
-
+ m.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD, "Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
+ m.put(JMX_MANAGER_SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of CA certificates trusted by jmx manager.");
+ m.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD, "Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+
m.put(JMX_MANAGER_PORT, "The port the jmx manager will listen on. Default is \"" + DEFAULT_JMX_MANAGER_PORT + "\". Set to zero to disable GemFire's creation of a jmx listening port.");
m.put(JMX_MANAGER_BIND_ADDRESS, "The address the jmx manager will listen on for remote connections. Default is \"\" which causes the jmx manager to listen on the host's default address. This property is ignored if jmx-manager-port is \"0\".");
m.put(JMX_MANAGER_HOSTNAME_FOR_CLIENTS, "The hostname that will be given to clients when they ask a locator for the location of this jmx manager. Default is \"\" which causes the locator to report the jmx manager's actual ip address as its location. This property is ignored if jmx-manager-port is \"0\".");
@@ -992,96 +864,57 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
m.put(USE_CLUSTER_CONFIGURATION, LocalizedStrings.AbstractDistributionConfig_USE_SHARED_CONFIGURATION.toLocalizedString());
m.put(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, LocalizedStrings.AbstractDistributionConfig_LOAD_SHARED_CONFIGURATION_FROM_DIR.toLocalizedString(SharedConfiguration.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME));
m.put(CLUSTER_CONFIGURATION_DIR, LocalizedStrings.AbstractDistributionConfig_CLUSTER_CONFIGURATION_DIR.toLocalizedString());
- m.put(
- SERVER_SSL_ENABLED,
- "If true then the cache server will only allow SSL clients to connect. Defaults to false.");
- m.put(
- SERVER_SSL_CIPHERS,
- "List of available SSL cipher suites that are to be enabled for CacheServer. Defaults to \""
- + DEFAULT_SERVER_SSL_CIPHERS
- + "\" meaning your provider''s defaults.");
- m.put(
- SERVER_SSL_PROTOCOLS,
- "List of available SSL protocols that are to be enabled for CacheServer. Defaults to \""
- + DEFAULT_SERVER_SSL_PROTOCOLS
- + "\" meaning defaults of your provider.");
- m.put(
- SERVER_SSL_REQUIRE_AUTHENTICATION,
- "If set to false, ciphers and protocols that permit anonymous Clients are allowed. Defaults to \""
- + DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION + "\".");
-
- m.put(SERVER_SSL_KEYSTORE,"Location of the Java keystore file containing server's or client's own certificate and private key.");
-
- m.put(SERVER_SSL_KEYSTORE_TYPE,
- "For Java keystore file format, this property has the value jks (or JKS).");
-
- m.put(SERVER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
-
- m.put(SERVER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by server or client(trust store).");
-
- m.put(SERVER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
-
- m.put(
- GATEWAY_SSL_ENABLED,
- "If true then the gateway receiver will only allow SSL gateway sender to connect. Defaults to false.");
- m.put(
- GATEWAY_SSL_CIPHERS,
- "List of available SSL cipher suites that are to be enabled for Gateway Receiver. Defaults to \""
- + DEFAULT_GATEWAY_SSL_CIPHERS
- + "\" meaning your provider''s defaults.");
- m.put(
- GATEWAY_SSL_PROTOCOLS,
- "List of available SSL protocols that are to be enabled for Gateway Receiver. Defaults to \""
- + DEFAULT_GATEWAY_SSL_PROTOCOLS
- + "\" meaning defaults of your provider.");
- m.put(
- GATEWAY_SSL_REQUIRE_AUTHENTICATION,
- "If set to false, ciphers and protocols that permit anonymous gateway senders are allowed. Defaults to \""
- + DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION + "\".");
-
- m.put(GATEWAY_SSL_KEYSTORE,"Location of the Java keystore file containing gateway's own certificate and private key.");
-
- m.put(GATEWAY_SSL_KEYSTORE_TYPE,
- "For Java keystore file format, this property has the value jks (or JKS).");
-
- m.put(GATEWAY_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
-
- m.put(GATEWAY_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by gateway.");
-
- m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
-
+ m.put(SERVER_SSL_ALIAS, LocalizedStrings.AbstractDistributionConfig_SERVER_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_ALIAS)));
+ m.put(SERVER_SSL_ENABLED, "If true then the cache server will only allow SSL clients to connect. Defaults to false.");
+ m.put(SERVER_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for CacheServer. Defaults to \"" + DEFAULT_SERVER_SSL_CIPHERS + "\" meaning your provider''s defaults.");
+ m.put(SERVER_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for CacheServer. Defaults to \"" + DEFAULT_SERVER_SSL_PROTOCOLS + "\" meaning defaults of your provider.");
+ m.put(SERVER_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous Clients are allowed. Defaults to \"" + DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION + "\".");
+
+ m.put(SERVER_SSL_KEYSTORE, "Location of the Java keystore file containing server's or client's own certificate and private key.");
+
+ m.put(SERVER_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
+
+ m.put(SERVER_SSL_KEYSTORE_PASSWORD, "Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
+
+ m.put(SERVER_SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of CA certificates trusted by server or client(trust store).");
+
+ m.put(SERVER_SSL_TRUSTSTORE_PASSWORD, "Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+
+ m.put(GATEWAY_SSL_ALIAS, LocalizedStrings.AbstractDistributionConfig_GATEWAY_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_ALIAS)));
+ m.put(GATEWAY_SSL_ENABLED, "If true then the gateway receiver will only allow SSL gateway sender to connect. Defaults to false.");
+ m.put(GATEWAY_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for Gateway Receiver. Defaults to \"" + DEFAULT_GATEWAY_SSL_CIPHERS + "\" meaning your provider''s defaults.");
+ m.put(GATEWAY_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for Gateway Receiver. Defaults to \"" + DEFAULT_GATEWAY_SSL_PROTOCOLS + "\" meaning defaults of your provider.");
+ m.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous gateway senders are allowed. Defaults to \"" + DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION + "\".");
+
+ m.put(GATEWAY_SSL_KEYSTORE, "Location of the Java keystore file containing gateway's own certificate and private key.");
+
+ m.put(GATEWAY_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
+
+ m.put(GATEWAY_SSL_KEYSTORE_PASSWORD, "Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+
+ m.put(GATEWAY_SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of CA certificates trusted by gateway.");
+
+ m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, "Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+
+ m.put(HTTP_SERVICE_SSL_ALIAS, LocalizedStrings.AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0.toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_ALIAS)));
m.put(HTTP_SERVICE_PORT, "If non zero, then the gemfire developer REST service will be deployed and started when the cache is created. Default value is 0.");
m.put(HTTP_SERVICE_BIND_ADDRESS, "The address where gemfire developer REST service will listen for remote REST connections. Default is \"\" which causes the Rest service to listen on the host's default address.");
-
- m.put(
- HTTP_SERVICE_SSL_ENABLED,
- "If true then the http service like REST dev api and Pulse will only allow SSL enabled clients to connect. Defaults to false.");
- m.put(
- HTTP_SERVICE_SSL_CIPHERS,
- "List of available SSL cipher suites that are to be enabled for Http Service. Defaults to \""
- + DEFAULT_HTTP_SERVICE_SSL_CIPHERS
- + "\" meaning your provider''s defaults.");
- m.put(
- HTTP_SERVICE_SSL_PROTOCOLS,
- "List of available SSL protocols that are to be enabled for Http Service. Defaults to \""
- + DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS
- + "\" meaning defaults of your provider.");
- m.put(
- HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
- "If set to false, ciphers and protocols that permit anonymous http clients are allowed. Defaults to \""
- + DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION + "\".");
-
- m.put(HTTP_SERVICE_SSL_KEYSTORE,"Location of the Java keystore file containing Http Service's own certificate and private key.");
-
- m.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE,
- "For Java keystore file format, this property has the value jks (or JKS).");
-
- m.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
-
- m.put(HTTP_SERVICE_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by Http Service.");
-
- m.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
-
+
+ m.put(HTTP_SERVICE_SSL_ENABLED, "If true then the http service like REST dev api and Pulse will only allow SSL enabled clients to connect. Defaults to false.");
+ m.put(HTTP_SERVICE_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for Http Service. Defaults to \"" + DEFAULT_HTTP_SERVICE_SSL_CIPHERS + "\" meaning your provider''s defaults.");
+ m.put(HTTP_SERVICE_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for Http Service. Defaults to \"" + DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS + "\" meaning defaults of your provider.");
+ m.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous http clients are allowed. Defaults to \"" + DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION + "\".");
+
+ m.put(HTTP_SERVICE_SSL_KEYSTORE, "Location of the Java keystore file containing Http Service's own certificate and private key.");
+
+ m.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
+
+ m.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+
+ m.put(HTTP_SERVICE_SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of CA certificates trusted by Http Service.");
+
+ m.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, "Password to unlock the keystore file (store password) specified by javax.net.ssl.trustStore.");
+
m.put(START_DEV_REST_API, "If true then the developer(API) REST service will be started when the cache is created. Defaults to false.");
m.put(OFF_HEAP_MEMORY_SIZE, LocalizedStrings.AbstractDistributionConfig_OFF_HEAP_MEMORY_SIZE_0.toLocalizedString(DEFAULT_OFF_HEAP_MEMORY_SIZE));
m.put(LOCK_MEMORY, LocalizedStrings.AbstractDistributionConfig_LOCK_MEMORY.toLocalizedString(DEFAULT_LOCK_MEMORY));
@@ -1092,15 +925,18 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
dcAttDescriptions = Collections.unmodifiableMap(m);
}
+
/**
* Used by unit tests.
*/
static public String[] _getAttNames() {
return dcValidAttributeNames;
}
+
public String[] getAttributeNames() {
return dcValidAttributeNames;
}
+
public String[] getSpecificAttributeNames() {
return dcValidAttributeNames;
}
@@ -1112,7 +948,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
public static final InetAddress _getDefaultMcastAddress() {
String ipLiteral;
- if ( SocketCreator.preferIPv6Addresses() ) {
+ if (SocketCreator.preferIPv6Addresses()) {
ipLiteral = "FF38::1234"; // fix for bug 30014
} else {
ipLiteral = "239.192.81.1"; // fix for bug 30014
@@ -1125,10 +961,13 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
}
}
-/**************************** static initializers to gather all the checkers in this class *************************/
+ /****************************
+ * static initializers to gather all the checkers in this class
+ *************************/
static final Map<String, Method> checkers = new HashMap<String, Method>();
- static{
- for(Method method:AbstractDistributionConfig.class.getDeclaredMethods()) {
+
+ static {
+ for (Method method : AbstractDistributionConfig.class.getDeclaredMethods()) {
if (method.isAnnotationPresent(ConfigAttributeChecker.class)) {
ConfigAttributeChecker checker = method.getAnnotation(ConfigAttributeChecker.class);
checkers.put(checker.name(), method);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6480b74/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index a09952e..7256b95 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -3760,6 +3760,12 @@ public class LocalizedStrings {
public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD = new StringId(6630, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with no analyzer on that field.");
public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD = new StringId(6631, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with analyzer {4} on that field.");
+ public static final StringId AbstractDistributionConfig_CLUSTER_SSL_ALIAS_0 = new StringId(6632,"SSL communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_GATEWAY_SSL_ALIAS_0 = new StringId(6632,"SSL gateway communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_SERVER_SSL_ALIAS_0 = new StringId(6632,"SSL inter-server communication (peer-to-peer) uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0 = new StringId(6632,"SSL http service communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+ public static final StringId AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0 = new StringId(6632,"SSL jmx communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\".");
+
/** Testing strings, messageId 90000-99999 **/
/** These are simple messages for testing, translated with Babelfish. **/
@@ -3772,4 +3778,5 @@ public class LocalizedStrings {
public static final StringId DistributedRegion_INITIALIZING_REGION_COMPLETED_0 = new StringId(90005, "Initialization of region {0} completed");
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b6480b74/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 9d0740e..48cc42f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -17,24 +17,28 @@
package com.gemstone.gemfire.distributed.internal;
import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class DistributionConfigJUnitTest {
@@ -105,23 +109,24 @@ public class DistributionConfigJUnitTest {
System.out.println();
System.out.println("otherList: " + otherList);
- assertEquals(boolList.size(), 30);
- assertEquals(intList.size(), 33);
- assertEquals(stringList.size(), 70);
- assertEquals(fileList.size(), 5);
- assertEquals(otherList.size(), 3);
+ //TODO - This makes no sense. One has no idea what the correct expected number of attributes are.
+ assertEquals(27, boolList.size());
+ assertEquals(33, intList.size());
+ assertEquals(73, stringList.size());
+ assertEquals(5, fileList.size());
+ assertEquals(3, otherList.size());
}
@Test
- public void testAttributeDesc(){
+ public void testAttributeDesc() {
String[] attNames = AbstractDistributionConfig._getAttNames();
- for(String attName:attNames){
- assertTrue("Does not contain description for attribute "+ attName, AbstractDistributionConfig.dcAttDescriptions.containsKey(attName));
+ for (String attName : attNames) {
+ assertTrue("Does not contain description for attribute " + attName, AbstractDistributionConfig.dcAttDescriptions.containsKey(attName));
}
List<String> attList = Arrays.asList(attNames);
- for(Object attName:AbstractDistributionConfig.dcAttDescriptions.keySet()){
- if(!attList.contains(attName)){
- System.out.println("Has unused description for "+attName.toString());
+ for (Object attName : AbstractDistributionConfig.dcAttDescriptions.keySet()) {
+ if (!attList.contains(attName)) {
+ System.out.println("Has unused description for " + attName.toString());
}
}
}
@@ -323,7 +328,7 @@ public class DistributionConfigJUnitTest {
@Test
- public void testSecurityProps(){
+ public void testSecurityProps() {
Properties props = new Properties();
props.put(SECURITY_CLIENT_AUTHENTICATOR, JSONAuthorization.class.getName() + ".create");
props.put(SECURITY_CLIENT_ACCESSOR, JSONAuthorization.class.getName() + ".create");
@@ -336,7 +341,7 @@ public class DistributionConfigJUnitTest {
}
@Test
- public void testSecurityPropsWithNoSetter(){
+ public void testSecurityPropsWithNoSetter() {
Properties props = new Properties();
props.put(SECURITY_CLIENT_AUTHENTICATOR, JSONAuthorization.class.getName() + ".create");
props.put(SECURITY_CLIENT_ACCESSOR, JSONAuthorization.class.getName() + ".create");
[09/33] incubator-geode git commit: GEODE-1494: Changing stats list
to be a CopyOnWriteArrayList
Posted by ud...@apache.org.
GEODE-1494: Changing stats list to be a CopyOnWriteArrayList
The statsList used to track Statistics in InternalDistributedSystem was
managed under a lock. That was problematic, because code that iterates
on the list needs to hold the lock. If the code invoking callbacks for
GEODE-1494 was slow, that means the lock would block other stats
operations.
Changing this list to a copy on write array list to holding a lock for a
long period of time.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e9ffdce4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e9ffdce4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e9ffdce4
Branch: refs/heads/feature/GEODE-420
Commit: e9ffdce4fdf4f5c3b9f4ae45e19168e3de55ebe9
Parents: 5e0050d
Author: Dan Smith <up...@apache.org>
Authored: Tue Jun 7 11:44:24 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Jun 13 10:38:36 2016 -0700
----------------------------------------------------------------------
.../internal/InternalDistributedSystem.java | 36 ++++-------
.../internal/AbstractStatisticsFactory.java | 65 ++++++++------------
.../gemfire/internal/GemFireStatSampler.java | 14 ++---
.../gemfire/internal/HostStatSampler.java | 10 ++-
.../cache/control/HeapMemoryMonitor.java | 20 +++---
5 files changed, 59 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9ffdce4/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 67f5478..a672127 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
@@ -1668,7 +1668,7 @@ public class InternalDistributedSystem
return sb.toString().trim();
}
- private final ArrayList<Statistics> statsList = new ArrayList<Statistics>();
+ private final CopyOnWriteArrayList<Statistics> statsList = new CopyOnWriteArrayList<Statistics>();
private int statsListModCount = 0;
private long statsListUniqueId = 1;
private final Object statsListUniqueIdLock = new Object();
@@ -1698,11 +1698,9 @@ public class InternalDistributedSystem
@Override
public final Statistics findStatistics(long id) {
List<Statistics> statsList = this.statsList;
- synchronized (statsList) {
- for (Statistics s : statsList) {
- if (s.getUniqueId() == id) {
- return s;
- }
+ for (Statistics s : statsList) {
+ if (s.getUniqueId() == id) {
+ return s;
}
}
throw new RuntimeException(LocalizedStrings.PureStatSampler_COULD_NOT_FIND_STATISTICS_INSTANCE.toLocalizedString());
@@ -1711,11 +1709,9 @@ public class InternalDistributedSystem
@Override
public final boolean statisticsExists(long id) {
List<Statistics> statsList = this.statsList;
- synchronized (statsList) {
- for (Statistics s : statsList) {
- if (s.getUniqueId() == id) {
- return true;
- }
+ for (Statistics s : statsList) {
+ if (s.getUniqueId() == id) {
+ return true;
}
}
return false;
@@ -1724,9 +1720,7 @@ public class InternalDistributedSystem
@Override
public final Statistics[] getStatistics() {
List<Statistics> statsList = this.statsList;
- synchronized (statsList) {
- return (Statistics[])statsList.toArray(new Statistics[statsList.size()]);
- }
+ return (Statistics[])statsList.toArray(new Statistics[statsList.size()]);
}
// StatisticsFactory methods
@@ -1786,10 +1780,8 @@ public class InternalDistributedSystem
* This method was added to fix bug 40358
*/
public void visitStatistics(StatisticsVisitor visitor) {
- synchronized (this.statsList) {
- for (Statistics s: this.statsList) {
- visitor.visit(s);
- }
+ for (Statistics s: this.statsList) {
+ visitor.visit(s);
}
}
@@ -1844,11 +1836,9 @@ public class InternalDistributedSystem
return (Statistics[])hits.toArray(result);
}
public Statistics findStatisticsByUniqueId(final long uniqueId) {
- synchronized (this.statsList) {
- for (Statistics s: this.statsList) {
- if (uniqueId == s.getUniqueId()) {
- return s;
- }
+ for (Statistics s: this.statsList) {
+ if (uniqueId == s.getUniqueId()) {
+ return s;
}
}
return null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9ffdce4/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
index 886258b..972e670 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
@@ -28,6 +28,7 @@ import java.io.Reader;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* An abstract standalone implementation of {@link StatisticsFactory}.
@@ -41,7 +42,7 @@ public abstract class AbstractStatisticsFactory
private final long id;
private final String name;
- private final List<Statistics> statsList;
+ private final CopyOnWriteArrayList<Statistics> statsList;
private int statsListModCount = 0;
private long statsListUniqueId = 1;
private final Object statsListUniqueIdLock;
@@ -53,7 +54,7 @@ public abstract class AbstractStatisticsFactory
this.name = name;
this.startTime = startTime;
- this.statsList = new ArrayList<Statistics>();
+ this.statsList = new CopyOnWriteArrayList<Statistics>();
this.statsListUniqueIdLock = new Object();
this.tf = StatisticsTypeFactoryImpl.singleton();
}
@@ -112,11 +113,9 @@ public abstract class AbstractStatisticsFactory
@Override
public final boolean statisticsExists(long id) {
List<Statistics> statsList = this.statsList;
- synchronized (statsList) {
- for (Statistics s : statsList) {
- if (s.getUniqueId() == id) {
- return true;
- }
+ for (Statistics s : statsList) {
+ if (s.getUniqueId() == id) {
+ return true;
}
}
return false;
@@ -125,9 +124,7 @@ public abstract class AbstractStatisticsFactory
@Override
public final Statistics[] getStatistics() {
List<Statistics> statsList = this.statsList;
- synchronized (statsList) {
- return (Statistics[])statsList.toArray(new Statistics[statsList.size()]);
- }
+ return (Statistics[])statsList.toArray(new Statistics[statsList.size()]);
}
// StatisticsFactory methods
@@ -163,13 +160,11 @@ public abstract class AbstractStatisticsFactory
@Override
public final Statistics[] findStatisticsByType(StatisticsType type) {
List<Statistics> hits = new ArrayList<Statistics>();
- synchronized (statsList) {
- Iterator<Statistics> it = statsList.iterator();
- while (it.hasNext()) {
- Statistics s = (Statistics)it.next();
- if (type == s.getType()) {
- hits.add(s);
- }
+ Iterator<Statistics> it = statsList.iterator();
+ while (it.hasNext()) {
+ Statistics s = (Statistics)it.next();
+ if (type == s.getType()) {
+ hits.add(s);
}
}
Statistics[] result = new Statistics[hits.size()];
@@ -179,13 +174,11 @@ public abstract class AbstractStatisticsFactory
@Override
public final Statistics[] findStatisticsByTextId(String textId) {
List<Statistics> hits = new ArrayList<Statistics>();
- synchronized (statsList) {
- Iterator<Statistics> it = statsList.iterator();
- while (it.hasNext()) {
- Statistics s = (Statistics)it.next();
- if (s.getTextId().equals(textId)) {
- hits.add(s);
- }
+ Iterator<Statistics> it = statsList.iterator();
+ while (it.hasNext()) {
+ Statistics s = (Statistics)it.next();
+ if (s.getTextId().equals(textId)) {
+ hits.add(s);
}
}
Statistics[] result = new Statistics[hits.size()];
@@ -195,13 +188,11 @@ public abstract class AbstractStatisticsFactory
@Override
public final Statistics[] findStatisticsByNumericId(long numericId) {
List<Statistics> hits = new ArrayList<Statistics>();
- synchronized (statsList) {
- Iterator<Statistics> it = statsList.iterator();
- while (it.hasNext()) {
- Statistics s = (Statistics)it.next();
- if (numericId == s.getNumericId()) {
- hits.add(s);
- }
+ Iterator<Statistics> it = statsList.iterator();
+ while (it.hasNext()) {
+ Statistics s = (Statistics)it.next();
+ if (numericId == s.getNumericId()) {
+ hits.add(s);
}
}
Statistics[] result = new Statistics[hits.size()];
@@ -209,13 +200,11 @@ public abstract class AbstractStatisticsFactory
}
public final Statistics findStatisticsByUniqueId(long uniqueId) {
- synchronized (statsList) {
- Iterator<Statistics> it = statsList.iterator();
- while (it.hasNext()) {
- Statistics s = (Statistics)it.next();
- if (uniqueId == s.getUniqueId()) {
- return s;
- }
+ Iterator<Statistics> it = statsList.iterator();
+ while (it.hasNext()) {
+ Statistics s = (Statistics)it.next();
+ if (uniqueId == s.getUniqueId()) {
+ return s;
}
}
return null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9ffdce4/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
index 5930506..1eb35d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
@@ -276,14 +276,12 @@ public final class GemFireStatSampler extends HostStatSampler {
}
if (stopRequested()) return;
HostStatHelper.readyRefreshOSStats();
- synchronized (l) {
- Iterator<Statistics> it = l.iterator();
- while (it.hasNext()) {
- if (stopRequested()) return;
- StatisticsImpl s = (StatisticsImpl)it.next();
- if (s.usesSystemCalls()) {
- HostStatHelper.refresh((LocalStatisticsImpl)s);
- }
+ Iterator<Statistics> it = l.iterator();
+ while (it.hasNext()) {
+ if (stopRequested()) return;
+ StatisticsImpl s = (StatisticsImpl)it.next();
+ if (s.usesSystemCalls()) {
+ HostStatHelper.refresh((LocalStatisticsImpl)s);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9ffdce4/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
index ebb4177..a5a07ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
@@ -510,12 +510,10 @@ public abstract class HostStatSampler
*/
private void sampleSpecialStats(boolean prepareOnly) {
List<Statistics> statsList = getStatisticsManager().getStatsList();
- synchronized (statsList) {
- for (Statistics s : statsList) {
- if (stopRequested()) return;
- if (s instanceof StatisticsImpl) {
- ((StatisticsImpl)s).prepareForSample();
- }
+ for (Statistics s : statsList) {
+ if (stopRequested()) return;
+ if (s instanceof StatisticsImpl) {
+ ((StatisticsImpl)s).prepareForSample();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9ffdce4/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
index 90a26cb..bc83335 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
@@ -304,18 +304,16 @@ public void stopMonitoring() {
sampler.waitForInitialization();
String tenuredPoolName = getTenuredMemoryPoolMXBean().getName();
List list = this.cache.getDistributedSystem().getStatsList();
- synchronized (list) {
- for (Object o : list) {
- if (o instanceof StatisticsImpl) {
- StatisticsImpl si = (StatisticsImpl) o;
- if (si.getTextId().contains(tenuredPoolName) && si.getType().getName().contains("PoolStats")) {
- sampler.addLocalStatListener(this.statListener, si, "currentUsedMemory");
- if (this.cache.getLoggerI18n().fineEnabled()) {
- this.cache.getLoggerI18n().fine("Registered stat listener for " + si.getTextId());
- }
-
- return true;
+ for (Object o : list) {
+ if (o instanceof StatisticsImpl) {
+ StatisticsImpl si = (StatisticsImpl) o;
+ if (si.getTextId().contains(tenuredPoolName) && si.getType().getName().contains("PoolStats")) {
+ sampler.addLocalStatListener(this.statListener, si, "currentUsedMemory");
+ if (this.cache.getLoggerI18n().fineEnabled()) {
+ this.cache.getLoggerI18n().fine("Registered stat listener for " + si.getTextId());
}
+
+ return true;
}
}
}
[04/33] incubator-geode git commit: Adding
etc/eclipseOrganizeImports.importorder to rat excludes
Posted by ud...@apache.org.
Adding etc/eclipseOrganizeImports.importorder to rat excludes
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1f74453d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1f74453d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1f74453d
Branch: refs/heads/feature/GEODE-420
Commit: 1f74453db3a6237ffe8fbdf33e7ca05372d291e3
Parents: 36184d5
Author: Dan Smith <up...@apache.org>
Authored: Thu Jun 9 17:45:13 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jun 9 17:45:42 2016 -0700
----------------------------------------------------------------------
gradle/rat.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f74453d/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index f507993..93cb91c 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -46,6 +46,7 @@ rat {
// IDE
'etc/eclipseFormatterProfile.xml',
'etc/intellijIdeaCodeStyle.xml',
+ 'etc/eclipseOrganizeImports.importorder',
'**/.project',
'**/.classpath',
'**/.settings/**',
[30/33] incubator-geode git commit: GEODE-420: Initial Alias
defintion and removal of deprecated SSL-ENABLED properties
Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/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 b793e34..5276f3a 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,14 +17,7 @@
package com.gemstone.gemfire.distributed.internal;
-import com.gemstone.gemfire.GemFireConfigException;
-import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-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 static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import java.io.File;
import java.io.IOException;
@@ -32,92 +25,135 @@ import java.io.Serializable;
import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
-import java.util.*;
+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 static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import com.gemstone.gemfire.GemFireConfigException;
+import com.gemstone.gemfire.GemFireIOException;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+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;
/**
* Provides an implementation of <code>DistributionConfig</code> that
* knows how to read the configuration file.
- *
- * <P>
- *
+ * <p>
+ * <p>
+ * <p>
* Note that if you add a property to this interface, should should
* update the {@link
* #DistributionConfigImpl(DistributionConfig) copy constructor}.
- *
* @see InternalDistributedSystem
- *
- *
* @since GemFire 2.1
*/
-public class DistributionConfigImpl
- extends AbstractDistributionConfig
- implements Serializable {
+public class DistributionConfigImpl extends AbstractDistributionConfig implements Serializable {
private static final long serialVersionUID = 4096393792893825167L;
- /** The name of the distribution manager/shared memory connection */
+ /**
+ * The name of the distribution manager/shared memory connection
+ */
private String name = DEFAULT_NAME;
- /** The tcp/ip port used for distribution */
+ /**
+ * The tcp/ip port used for distribution
+ */
private int tcpPort = DEFAULT_TCP_PORT;
- /** The multicast port used for distribution */
+ /**
+ * The multicast port used for distribution
+ */
private int mcastPort = DEFAULT_MCAST_PORT;
- /** The multicast ttl used for distribution */
+ /**
+ * The multicast ttl used for distribution
+ */
private int mcastTtl = DEFAULT_MCAST_TTL;
private int socketLeaseTime = DEFAULT_SOCKET_LEASE_TIME;
private int socketBufferSize = DEFAULT_SOCKET_BUFFER_SIZE;
private boolean conserveSockets = DEFAULT_CONSERVE_SOCKETS;
- /** Comma-delimited list of the application roles performed by this member. */
+ /**
+ * Comma-delimited list of the application roles performed by this member.
+ */
private String roles = DEFAULT_ROLES;
- /** The multicast address used for distribution */
+ /**
+ * The multicast address used for distribution
+ */
private InetAddress mcastAddress = DEFAULT_MCAST_ADDRESS;
- /** The address server socket's should listen on */
+ /**
+ * The address server socket's should listen on
+ */
private String bindAddress = DEFAULT_BIND_ADDRESS;
- /** The address server socket's in a client-server topology should listen on */
+ /**
+ * The address server socket's in a client-server topology should listen on
+ */
private String serverBindAddress = DEFAULT_SERVER_BIND_ADDRESS;
- /** The locations of the distribution locators */
+ /**
+ * The locations of the distribution locators
+ */
private String locators = DEFAULT_LOCATORS;
-
- /** The amount of time to wait for a locator to appear when starting up */
+
+ /**
+ * The amount of time to wait for a locator to appear when starting up
+ */
private int locatorWaitTime;
-
- /** The name of the log file */
+
+ /**
+ * The name of the log file
+ */
private File logFile = DEFAULT_LOG_FILE;
-
+
protected File deployWorkingDir = DEFAULT_DEPLOY_WORKING_DIR;
-
- /** The level at which log messages are logged
- *
+
+ /**
+ * The level at which log messages are logged
* @see com.gemstone.gemfire.internal.logging.LogWriterImpl#levelNameToCode(String)
*/
protected int logLevel = DEFAULT_LOG_LEVEL;
- /** bind-address and host of locator to start */
+ /**
+ * bind-address and host of locator to start
+ */
private String startLocator = DEFAULT_START_LOCATOR;
- /** port of locator to start. use bind-address as host name */
+ /**
+ * port of locator to start. use bind-address as host name
+ */
private int startLocatorPort;
- /** Is statistic sampling enabled? */
+ /**
+ * Is statistic sampling enabled?
+ */
protected boolean statisticSamplingEnabled = DEFAULT_STATISTIC_SAMPLING_ENABLED;
- /** The rate (in milliseconds) at which statistics are sampled */
+ /**
+ * The rate (in milliseconds) at which statistics are sampled
+ */
protected int statisticSampleRate = DEFAULT_STATISTIC_SAMPLE_RATE;
- /** The name of the file to which statistics should be archived */
+ /**
+ * The name of the file to which statistics should be archived
+ */
protected File statisticArchiveFile = DEFAULT_STATISTIC_ARCHIVE_FILE;
- /** The amount of time to wait for a ACK message */
+ /**
+ * The amount of time to wait for a ACK message
+ */
private int ackWaitThreshold = DEFAULT_ACK_WAIT_THRESHOLD;
/**
@@ -127,7 +163,9 @@ public class DistributionConfigImpl
*/
private int ackForceDisconnectThreshold = DEFAULT_ACK_SEVERE_ALERT_THRESHOLD;
- /** The name of an XML file used to initialize the cache */
+ /**
+ * The name of an XML file used to initialize the cache
+ */
private File cacheXmlFile = Boolean.getBoolean(InternalLocator.FORCE_LOCATOR_DM_TYPE) ? new File("") : DEFAULT_CACHE_XML_FILE;
protected int archiveDiskSpaceLimit = DEFAULT_ARCHIVE_DISK_SPACE_LIMIT;
@@ -135,55 +173,71 @@ public class DistributionConfigImpl
protected int logDiskSpaceLimit = DEFAULT_LOG_DISK_SPACE_LIMIT;
protected int logFileSizeLimit = DEFAULT_LOG_FILE_SIZE_LIMIT;
- protected boolean sslEnabled = DEFAULT_SSL_ENABLED;
- protected String sslProtocols = DEFAULT_SSL_PROTOCOLS;
- protected String sslCiphers = DEFAULT_SSL_CIPHERS;
- protected boolean sslRequireAuthentication = DEFAULT_SSL_REQUIRE_AUTHENTICATION;
-
- protected boolean clusterSSLEnabled = DEFAULT_CLUSTER_SSL_ENABLED;
- protected String clusterSSLProtocols = DEFAULT_CLUSTER_SSL_PROTOCOLS;
- protected String clusterSSLCiphers = DEFAULT_CLUSTER_SSL_CIPHERS;
- protected boolean clusterSSLRequireAuthentication = DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
- protected String clusterSSLKeyStore = DEFAULT_CLUSTER_SSL_KEYSTORE;
- protected String clusterSSLKeyStoreType = DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE;
- protected String clusterSSLKeyStorePassword = DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD;
- protected String clusterSSLTrustStore = DEFAULT_CLUSTER_SSL_TRUSTSTORE;
- protected String clusterSSLTrustStorePassword = DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD;
-
- /** multicast send buffer size, in bytes */
+ private boolean clusterSSLEnabled = DEFAULT_CLUSTER_SSL_ENABLED;
+ private String clusterSSLProtocols = DEFAULT_CLUSTER_SSL_PROTOCOLS;
+ private String clusterSSLCiphers = DEFAULT_CLUSTER_SSL_CIPHERS;
+ private boolean clusterSSLRequireAuthentication = DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
+ private String clusterSSLKeyStore = DEFAULT_CLUSTER_SSL_KEYSTORE;
+ private String clusterSSLKeyStoreType = DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE;
+ private String clusterSSLKeyStorePassword = DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD;
+ private String clusterSSLTrustStore = DEFAULT_CLUSTER_SSL_TRUSTSTORE;
+ private String clusterSSLTrustStorePassword = DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+ private String clusterSSLAlias = DEFAULT_CLUSTER_SSL_ALIAS;
+
+ /**
+ * multicast send buffer size, in bytes
+ */
protected int mcastSendBufferSize = DEFAULT_MCAST_SEND_BUFFER_SIZE;
- /** multicast receive buffer size, in bytes */
+ /**
+ * multicast receive buffer size, in bytes
+ */
protected int mcastRecvBufferSize = DEFAULT_MCAST_RECV_BUFFER_SIZE;
- /** flow-of-control parameters for multicast messaging */
+ /**
+ * flow-of-control parameters for multicast messaging
+ */
protected FlowControlParams mcastFlowControl = DEFAULT_MCAST_FLOW_CONTROL;
- /** datagram socket send buffer size, in bytes */
+ /**
+ * datagram socket send buffer size, in bytes
+ */
protected int udpSendBufferSize = DEFAULT_UDP_SEND_BUFFER_SIZE;
- /** datagram socket receive buffer size, in bytes */
+ /**
+ * datagram socket receive buffer size, in bytes
+ */
protected int udpRecvBufferSize = DEFAULT_UDP_RECV_BUFFER_SIZE;
- /** max datagram message size, in bytes. This should be < 64k */
+ /**
+ * max datagram message size, in bytes. This should be < 64k
+ */
protected int udpFragmentSize = DEFAULT_UDP_FRAGMENT_SIZE;
- /** whether tcp/ip sockets should be disabled */
+ /**
+ * whether tcp/ip sockets should be disabled
+ */
protected boolean disableTcp = DEFAULT_DISABLE_TCP;
- /** whether time statistics should be enabled for the distributed system */
+ /**
+ * whether time statistics should be enabled for the distributed system
+ */
protected boolean enableTimeStatistics = DEFAULT_ENABLE_TIME_STATISTICS;
- /** member contact timeout, in milliseconds, for failure detection */
+ /**
+ * member contact timeout, in milliseconds, for failure detection
+ */
protected int memberTimeout = DEFAULT_MEMBER_TIMEOUT;
-
- /** the Jgroups port ranges allowed */
+
+ /**
+ * the Jgroups port ranges allowed
+ */
protected int[] membershipPortRange = DEFAULT_MEMBERSHIP_PORT_RANGE;
-
+
/**
* Max wait time for the member before reconnecting to the DS in case of
* required role loss.
- * */
+ */
private int maxWaitTimeForReconnect = DEFAULT_MAX_WAIT_TIME_FOR_RECONNECT;
/**
* Max number of tries allowed for reconnect in case of required role loss.
- * */
+ */
private int maxNumReconnectTries = DEFAULT_MAX_NUM_RECONNECT_TRIES;
@@ -191,59 +245,90 @@ public class DistributionConfigImpl
protected int asyncQueueTimeout = DEFAULT_ASYNC_QUEUE_TIMEOUT;
protected int asyncMaxQueueSize = DEFAULT_ASYNC_MAX_QUEUE_SIZE;
- /** @since GemFire 5.7 */
+ /**
+ * @since GemFire 5.7
+ */
private String clientConflation = CLIENT_CONFLATION_PROP_VALUE_DEFAULT;
- /** The id of the durable client */
+ /**
+ * The id of the durable client
+ */
private String durableClientId = DEFAULT_DURABLE_CLIENT_ID;
- /** The timeout of the durable client */
+ /**
+ * The timeout of the durable client
+ */
private int durableClientTimeout = DEFAULT_DURABLE_CLIENT_TIMEOUT;
- /** The client authentication initialization method name*/
+ /**
+ * The client authentication initialization method name
+ */
private String securityClientAuthInit = DEFAULT_SECURITY_CLIENT_AUTH_INIT;
- /** The client authenticating method name*/
+ /**
+ * The client authenticating method name
+ */
private String securityClientAuthenticator = DEFAULT_SECURITY_CLIENT_AUTHENTICATOR;
- /** The client Diffie-Hellman method name*/
+ /**
+ * The client Diffie-Hellman method name
+ */
private String securityClientDHAlgo = DEFAULT_SECURITY_CLIENT_DHALGO;
- /** The peer authentication initialization method name*/
+ /**
+ * The peer authentication initialization method name
+ */
private String securityPeerAuthInit = DEFAULT_SECURITY_PEER_AUTH_INIT;
- /** The peer authenticating method name*/
+ /**
+ * The peer authenticating method name
+ */
private String securityPeerAuthenticator = DEFAULT_SECURITY_PEER_AUTHENTICATOR;
- /** The client authorization method name*/
+ /**
+ * The client authorization method name
+ */
private String securityClientAccessor = DEFAULT_SECURITY_CLIENT_ACCESSOR;
- /** The post-processing client authorization method name*/
+ /**
+ * The post-processing client authorization method name
+ */
private String securityClientAccessorPP = DEFAULT_SECURITY_CLIENT_ACCESSOR_PP;
/**
* The level at which security related log messages are logged
- *
* @see com.gemstone.gemfire.internal.logging.LogWriterImpl#levelNameToCode(String)
*/
protected int securityLogLevel = DEFAULT_LOG_LEVEL;
- /** whether network partition detection algorithms are enabled */
+ /**
+ * whether network partition detection algorithms are enabled
+ */
private boolean enableNetworkPartitionDetection = DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION;
-
- /** whether auto reconnect after network partition is disabled */
+
+ /**
+ * whether auto reconnect after network partition is disabled
+ */
private boolean disableAutoReconnect = DEFAULT_DISABLE_AUTO_RECONNECT;
- /** The security log file */
+ /**
+ * The security log file
+ */
private File securityLogFile = DEFAULT_SECURITY_LOG_FILE;
- /** The p2p membership check timeout */
+ /**
+ * The p2p membership check timeout
+ */
private int securityPeerMembershipTimeout = DEFAULT_SECURITY_PEER_VERIFYMEMBER_TIMEOUT;
- /** The member security credentials */
+ /**
+ * The member security credentials
+ */
private Properties security = new Properties();
- /** The User defined properties to be used for cache.xml replacements */
+ /**
+ * The User defined properties to be used for cache.xml replacements
+ */
private Properties userDefinedProps = new Properties();
/**
* Prefix to use for properties that are put as JVM java properties for use
@@ -252,41 +337,51 @@ public class DistributionConfigImpl
*/
public static final String SECURITY_SYSTEM_PREFIX = GEMFIRE_PREFIX + "sys.";
- /** whether to remove unresponsive client or not */
+ /**
+ * whether to remove unresponsive client or not
+ */
private boolean removeUnresponsiveClient = DEFAULT_REMOVE_UNRESPONSIVE_CLIENT;
- /** Is delta propagation enabled or not **/
+ /**
+ * Is delta propagation enabled or not
+ **/
private boolean deltaPropagation = DEFAULT_DELTA_PROPAGATION;
-
+
private Map props;
-
+
private int distributedSystemId = DistributionConfig.DEFAULT_DISTRIBUTED_SYSTEM_ID;
- /** The locations of the remote distribution locators */
+ /**
+ * The locations of the remote distribution locators
+ */
private String remoteLocators = DEFAULT_REMOTE_LOCATORS;
-
+
private boolean enforceUniqueHost = DistributionConfig.DEFAULT_ENFORCE_UNIQUE_HOST;
-
+
private String redundancyZone = DistributionConfig.DEFAULT_REDUNDANCY_ZONE;
- /** holds the ssl properties specified in gfsecurity.properties */
+ /**
+ * holds the ssl properties specified in gfsecurity.properties
+ */
private Properties sslProperties = new Properties();
-
- /** holds the ssl properties specified in gfsecurity.properties */
+
+ /**
+ * holds the ssl properties specified in gfsecurity.properties
+ */
private Properties clusterSSLProperties = new Properties();
-
+
private String groups = DEFAULT_GROUPS;
-
- protected boolean enableSharedConfiguration = DistributionConfig.DEFAULT_ENABLE_CLUSTER_CONFIGURATION;
- protected boolean useSharedConfiguration = DistributionConfig.DEFAULT_USE_CLUSTER_CONFIGURATION;
- protected boolean loadSharedConfigurationFromDir = DistributionConfig.DEFAULT_LOAD_CLUSTER_CONFIG_FROM_DIR;
- protected String clusterConfigDir = DistributionConfig.DEFAULT_CLUSTER_CONFIGURATION_DIR;
-
-
+
+ private boolean enableSharedConfiguration = DistributionConfig.DEFAULT_ENABLE_CLUSTER_CONFIGURATION;
+ private boolean useSharedConfiguration = DistributionConfig.DEFAULT_USE_CLUSTER_CONFIGURATION;
+ private boolean loadSharedConfigurationFromDir = DistributionConfig.DEFAULT_LOAD_CLUSTER_CONFIG_FROM_DIR;
+ private String clusterConfigDir = DistributionConfig.DEFAULT_CLUSTER_CONFIGURATION_DIR;
+
+
private int httpServicePort = DEFAULT_HTTP_SERVICE_PORT;
private String httpServiceBindAddress = DEFAULT_HTTP_SERVICE_BIND_ADDRESS;
-
+
private boolean startDevRestApi = DEFAULT_START_DEV_REST_API;
/**
* port on which {@link GemFireMemcachedServer} server is started
@@ -302,96 +397,109 @@ public class DistributionConfigImpl
* Bind address for GemFireMemcachedServer
*/
private String memcachedBindAddress = DEFAULT_MEMCACHED_BIND_ADDRESS;
-
- /** Are distributed transactions enabled or not */
+
+ /**
+ * Are distributed transactions enabled or not
+ */
private boolean distributedTransactions = DEFAULT_DISTRIBUTED_TRANSACTIONS;
-
+
/**
* port on which {@link com.gemstone.gemfire.redis.GemFireRedisServer} is started
*/
private int redisPort = DEFAULT_REDIS_PORT;
-
+
/**
* Bind address for GemFireRedisServer
*/
private String redisBindAddress = DEFAULT_REDIS_BIND_ADDRESS;
-
+
private String redisPassword = DEFAULT_REDIS_PASSWORD;
private boolean jmxManager = Boolean.getBoolean(InternalLocator.FORCE_LOCATOR_DM_TYPE) ? true : DEFAULT_JMX_MANAGER;
private boolean jmxManagerStart = DEFAULT_JMX_MANAGER_START;
-
+
private int jmxManagerPort = DEFAULT_JMX_MANAGER_PORT;
private String jmxManagerBindAddress = DEFAULT_JMX_MANAGER_BIND_ADDRESS;
private String jmxManagerHostnameForClients = DEFAULT_JMX_MANAGER_HOSTNAME_FOR_CLIENTS;
private String jmxManagerPasswordFile = DEFAULT_JMX_MANAGER_PASSWORD_FILE;
private String jmxManagerAccessFile = DEFAULT_JMX_MANAGER_ACCESS_FILE;
- private int jmxManagerHttpPort = DEFAULT_HTTP_SERVICE_PORT;
+ private int jmxManagerHttpPort = DEFAULT_HTTP_SERVICE_PORT;
private int jmxManagerUpdateRate = DEFAULT_JMX_MANAGER_UPDATE_RATE;
-
- private boolean jmxManagerSSL = DEFAULT_JMX_MANAGER_SSL;
+
private boolean jmxManagerSSLEnabled = DEFAULT_JMX_MANAGER_SSL_ENABLED;
private boolean jmxManagerSslRequireAuthentication = DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
private String jmxManagerSslProtocols = DEFAULT_JMX_MANAGER_SSL_PROTOCOLS;
private String jmxManagerSslCiphers = DEFAULT_JMX_MANAGER_SSL_CIPHERS;
private Properties jmxManagerSslProperties = new Properties();
-
- protected String jmxManagerSSLKeyStore = DEFAULT_JMX_MANAGER_SSL_KEYSTORE;
- protected String jmxManagerSSLKeyStoreType = DEFAULT_JMX_MANAGER_SSL_KEYSTORE_TYPE;
- protected String jmxManagerSSLKeyStorePassword = DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
- protected String jmxManagerSSLTrustStore = DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE;
- protected String jmxManagerSSLTrustStorePassword = DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
-
+
+ private String jmxManagerSSLKeyStore = DEFAULT_JMX_MANAGER_SSL_KEYSTORE;
+ private String jmxManagerSSLKeyStoreType = DEFAULT_JMX_MANAGER_SSL_KEYSTORE_TYPE;
+ private String jmxManagerSSLKeyStorePassword = DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
+ private String jmxManagerSSLTrustStore = DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE;
+ private String jmxManagerSSLTrustStorePassword = DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
+
+ private String jmxManagerSSLAlias = clusterSSLAlias;
+
private boolean serverSSLEnabled = DEFAULT_SERVER_SSL_ENABLED;
private boolean serverSslRequireAuthentication = DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION;
private String serverSslProtocols = DEFAULT_SERVER_SSL_PROTOCOLS;
private String serverSslCiphers = DEFAULT_SERVER_SSL_CIPHERS;
private Properties serverSslProperties = new Properties();
-
- protected String serverSSLKeyStore = DEFAULT_SERVER_SSL_KEYSTORE;
- protected String serverSSLKeyStoreType = DEFAULT_SERVER_SSL_KEYSTORE_TYPE;
- protected String serverSSLKeyStorePassword = DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD;
- protected String serverSSLTrustStore = DEFAULT_SERVER_SSL_TRUSTSTORE;
- protected String serverSSLTrustStorePassword = DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD;
+
+ private String serverSSLKeyStore = DEFAULT_SERVER_SSL_KEYSTORE;
+ private String serverSSLKeyStoreType = DEFAULT_SERVER_SSL_KEYSTORE_TYPE;
+ private String serverSSLKeyStorePassword = DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD;
+ private String serverSSLTrustStore = DEFAULT_SERVER_SSL_TRUSTSTORE;
+ private String serverSSLTrustStorePassword = DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD;
+
+ private String serverSSLAlias = clusterSSLAlias;
private boolean gatewaySSLEnabled = DEFAULT_GATEWAY_SSL_ENABLED;
private boolean gatewaySslRequireAuthentication = DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION;
private String gatewaySslProtocols = DEFAULT_GATEWAY_SSL_PROTOCOLS;
private String gatewaySslCiphers = DEFAULT_GATEWAY_SSL_CIPHERS;
private Properties gatewaySslProperties = new Properties();
-
- protected String gatewaySSLKeyStore = DEFAULT_GATEWAY_SSL_KEYSTORE;
- protected String gatewaySSLKeyStoreType = DEFAULT_GATEWAY_SSL_KEYSTORE_TYPE;
- protected String gatewaySSLKeyStorePassword = DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD;
- protected String gatewaySSLTrustStore = DEFAULT_GATEWAY_SSL_TRUSTSTORE;
- protected String gatewaySSLTrustStorePassword = DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD;
-
-
+
+ private String gatewaySSLKeyStore = DEFAULT_GATEWAY_SSL_KEYSTORE;
+ private String gatewaySSLKeyStoreType = DEFAULT_GATEWAY_SSL_KEYSTORE_TYPE;
+ private String gatewaySSLKeyStorePassword = DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD;
+ private String gatewaySSLTrustStore = DEFAULT_GATEWAY_SSL_TRUSTSTORE;
+ private String gatewaySSLTrustStorePassword = DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD;
+
+ private String gatewaySSLAlias = clusterSSLAlias;
+
+
private boolean httpServiceSSLEnabled = DEFAULT_HTTP_SERVICE_SSL_ENABLED;
private boolean httpServiceSSLRequireAuthentication = DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
private String httpServiceSSLProtocols = DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS;
private String httpServiceSSLCiphers = DEFAULT_HTTP_SERVICE_SSL_CIPHERS;
private Properties httpServiceSSLProperties = new Properties();
-
- protected String httpServiceSSLKeyStore = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE;
- protected String httpServiceSSLKeyStoreType = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_TYPE;
- protected String httpServiceSSLKeyStorePassword = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
- protected String httpServiceSSLTrustStore = DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE;
- protected String httpServiceSSLTrustStorePassword = DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
-
+
+ private String httpServiceSSLKeyStore = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE;
+ private String httpServiceSSLKeyStoreType = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_TYPE;
+ private String httpServiceSSLKeyStorePassword = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
+ private String httpServiceSSLTrustStore = DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE;
+ private String httpServiceSSLTrustStorePassword = DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
+
+ private String httpServiceSSLAlias = clusterSSLAlias;
+
private Map<String, ConfigSource> sourceMap = Collections.synchronizedMap(new HashMap<String, ConfigSource>());
-
+
protected String userCommandPackages = DEFAULT_USER_COMMAND_PACKAGES;
-
- /** "off-heap-memory-size" with value of "" or "<size>[g|m]" */
+
+ /**
+ * "off-heap-memory-size" with value of "" or "<size>[g|m]"
+ */
protected String offHeapMemorySize = DEFAULT_OFF_HEAP_MEMORY_SIZE;
-
- /** Whether pages should be locked into memory or allowed to swap to disk */
+
+ /**
+ * Whether pages should be locked into memory or allowed to swap to disk
+ */
private boolean lockMemory = DEFAULT_LOCK_MEMORY;
private String shiroInit = "";
-
+
////////////////////// Constructors //////////////////////
/**
@@ -410,11 +518,11 @@ public class DistributionConfigImpl
this.mcastAddress = other.getMcastAddress();
this.bindAddress = other.getBindAddress();
this.serverBindAddress = other.getServerBindAddress();
- this.locators = ((DistributionConfigImpl)other).locators;
+ this.locators = ((DistributionConfigImpl) other).locators;
this.locatorWaitTime = other.getLocatorWaitTime();
this.remoteLocators = other.getRemoteLocators();
this.startLocator = other.getStartLocator();
- this.startLocatorPort = ((DistributionConfigImpl)other).startLocatorPort;
+ this.startLocatorPort = ((DistributionConfigImpl) other).startLocatorPort;
this.deployWorkingDir = other.getDeployWorkingDir();
this.logFile = other.getLogFile();
this.logLevel = other.getLogLevel();
@@ -428,19 +536,15 @@ public class DistributionConfigImpl
this.archiveFileSizeLimit = other.getArchiveFileSizeLimit();
this.logDiskSpaceLimit = other.getLogDiskSpaceLimit();
this.logFileSizeLimit = other.getLogFileSizeLimit();
- this.sslEnabled = other.getSSLEnabled();
- this.sslProtocols = other.getSSLProtocols();
- this.sslCiphers = other.getSSLCiphers();
- this.sslRequireAuthentication = other.getSSLRequireAuthentication();
this.clusterSSLEnabled = other.getClusterSSLEnabled();
this.clusterSSLProtocols = other.getClusterSSLProtocols();
this.clusterSSLCiphers = other.getClusterSSLCiphers();
this.clusterSSLRequireAuthentication = other.getClusterSSLRequireAuthentication();
this.clusterSSLKeyStore = other.getClusterSSLKeyStore();
- this.clusterSSLKeyStoreType= other.getClusterSSLKeyStoreType();
- this.clusterSSLKeyStorePassword= other.getClusterSSLKeyStorePassword();
- this.clusterSSLTrustStore= other.getClusterSSLTrustStore();
- this.clusterSSLTrustStorePassword= other.getClusterSSLTrustStorePassword();
+ this.clusterSSLKeyStoreType = other.getClusterSSLKeyStoreType();
+ this.clusterSSLKeyStorePassword = other.getClusterSSLKeyStorePassword();
+ this.clusterSSLTrustStore = other.getClusterSSLTrustStore();
+ this.clusterSSLTrustStorePassword = other.getClusterSSLTrustStorePassword();
this.asyncDistributionTimeout = other.getAsyncDistributionTimeout();
this.asyncQueueTimeout = other.getAsyncQueueTimeout();
this.asyncMaxQueueSize = other.getAsyncMaxQueueSize();
@@ -486,21 +590,20 @@ public class DistributionConfigImpl
this.jmxManagerSslProperties = other.getJmxSSLProperties();
//Similar to this.security, assigning userDefinedProps
this.userDefinedProps.putAll(other.getUserDefinedProps());
-
+
// following added for 7.0
this.groups = other.getGroups();
this.jmxManager = other.getJmxManager();
this.jmxManagerStart = other.getJmxManagerStart();
- this.jmxManagerSSL = other.getJmxManagerSSL();
this.jmxManagerSSLEnabled = other.getJmxManagerSSLEnabled();
this.jmxManagerSslRequireAuthentication = other.getJmxManagerSSLRequireAuthentication();
this.jmxManagerSslProtocols = other.getJmxManagerSSLProtocols();
this.jmxManagerSslCiphers = other.getJmxManagerSSLCiphers();
this.jmxManagerSSLKeyStore = other.getJmxManagerSSLKeyStore();
- this.jmxManagerSSLKeyStoreType= other.getJmxManagerSSLKeyStoreType();
- this.jmxManagerSSLKeyStorePassword= other.getJmxManagerSSLKeyStorePassword();
- this.jmxManagerSSLTrustStore= other.getJmxManagerSSLTrustStore();
- this.jmxManagerSSLTrustStorePassword= other.getJmxManagerSSLTrustStorePassword();
+ this.jmxManagerSSLKeyStoreType = other.getJmxManagerSSLKeyStoreType();
+ this.jmxManagerSSLKeyStorePassword = other.getJmxManagerSSLKeyStorePassword();
+ this.jmxManagerSSLTrustStore = other.getJmxManagerSSLTrustStore();
+ this.jmxManagerSSLTrustStorePassword = other.getJmxManagerSSLTrustStorePassword();
this.jmxManagerSslProperties = other.getJmxSSLProperties();
this.jmxManagerPort = other.getJmxManagerPort();
this.jmxManagerBindAddress = other.getJmxManagerBindAddress();
@@ -516,7 +619,7 @@ public class DistributionConfigImpl
this.redisBindAddress = other.getRedisBindAddress();
this.redisPassword = other.getRedisPassword();
this.userCommandPackages = other.getUserCommandPackages();
-
+
// following added for 8.0
this.enableSharedConfiguration = other.getEnableClusterConfiguration();
this.loadSharedConfigurationFromDir = other.getLoadClusterConfigFromDir();
@@ -527,26 +630,26 @@ public class DistributionConfigImpl
this.serverSslProtocols = other.getServerSSLProtocols();
this.serverSslCiphers = other.getServerSSLCiphers();
this.serverSSLKeyStore = other.getServerSSLKeyStore();
- this.serverSSLKeyStoreType= other.getServerSSLKeyStoreType();
- this.serverSSLKeyStorePassword= other.getServerSSLKeyStorePassword();
- this.serverSSLTrustStore= other.getServerSSLTrustStore();
- this.serverSSLTrustStorePassword= other.getServerSSLTrustStorePassword();
+ this.serverSSLKeyStoreType = other.getServerSSLKeyStoreType();
+ this.serverSSLKeyStorePassword = other.getServerSSLKeyStorePassword();
+ this.serverSSLTrustStore = other.getServerSSLTrustStore();
+ this.serverSSLTrustStorePassword = other.getServerSSLTrustStorePassword();
this.serverSslProperties = other.getServerSSLProperties();
-
+
this.gatewaySSLEnabled = other.getGatewaySSLEnabled();
this.gatewaySslRequireAuthentication = other.getGatewaySSLRequireAuthentication();
this.gatewaySslProtocols = other.getGatewaySSLProtocols();
this.gatewaySslCiphers = other.getGatewaySSLCiphers();
this.gatewaySSLKeyStore = other.getGatewaySSLKeyStore();
- this.gatewaySSLKeyStoreType= other.getGatewaySSLKeyStoreType();
- this.gatewaySSLKeyStorePassword= other.getGatewaySSLKeyStorePassword();
- this.gatewaySSLTrustStore= other.getGatewaySSLTrustStore();
- this.gatewaySSLTrustStorePassword= other.getGatewaySSLTrustStorePassword();
+ this.gatewaySSLKeyStoreType = other.getGatewaySSLKeyStoreType();
+ this.gatewaySSLKeyStorePassword = other.getGatewaySSLKeyStorePassword();
+ this.gatewaySSLTrustStore = other.getGatewaySSLTrustStore();
+ this.gatewaySSLTrustStorePassword = other.getGatewaySSLTrustStorePassword();
this.gatewaySslProperties = other.getGatewaySSLProperties();
-
+
this.httpServicePort = other.getHttpServicePort();
this.httpServiceBindAddress = other.getHttpServiceBindAddress();
-
+
this.httpServiceSSLEnabled = other.getHttpServiceSSLEnabled();
this.httpServiceSSLCiphers = other.getHttpServiceSSLCiphers();
this.httpServiceSSLProtocols = other.getHttpServiceSSLProtocols();
@@ -557,20 +660,25 @@ public class DistributionConfigImpl
this.httpServiceSSLTrustStore = other.getHttpServiceSSLTrustStore();
this.httpServiceSSLTrustStorePassword = other.getHttpServiceSSLTrustStorePassword();
this.httpServiceSSLProperties = other.getHttpServiceSSLProperties();
-
+
this.startDevRestApi = other.getStartDevRestApi();
// following added for 9.0
this.offHeapMemorySize = other.getOffHeapMemorySize();
-
- Map<String, ConfigSource> otherSources = ((DistributionConfigImpl)other).sourceMap;
+
+ Map<String, ConfigSource> otherSources = ((DistributionConfigImpl) other).sourceMap;
if (otherSources != null) {
this.sourceMap = new HashMap<String, ConfigSource>(otherSources);
}
-
+
this.lockMemory = other.getLockMemory();
this.distributedTransactions = other.getDistributedTransactions();
this.shiroInit = other.getShiroInit();
+ this.clusterSSLAlias = other.getClusterSSLAlias();
+ this.gatewaySSLAlias = other.getGatewaySSLAlias();
+ this.httpServiceSSLAlias = other.getHTTPServiceSSLAlias();
+ this.jmxManagerSSLAlias = other.getJMXManagerSSLAlias();
+ this.serverSSLAlias = other.getServerSSLAlias();
}
/**
@@ -598,9 +706,7 @@ public class DistributionConfigImpl
* non-default configuration properties. See {@link
* com.gemstone.gemfire.distributed.DistributedSystem#connect} for a
* list of exceptions that may be thrown.
- *
- * @param nonDefault
- * The configuration properties specified by the caller
+ * @param nonDefault The configuration properties specified by the caller
*/
public DistributionConfigImpl(Properties nonDefault) {
this(nonDefault, false, false);
@@ -611,41 +717,32 @@ public class DistributionConfigImpl
* non-default configuration properties. See
* {@link com.gemstone.gemfire.distributed.DistributedSystem#connect} for a
* list of exceptions that may be thrown.
- *
- * @param nonDefault
- * The configuration properties specified by the caller
- * @param ignoreGemFirePropsFile
- * whether to skip loading distributed system properties from
- * gemfire.properties file
- *
+ * @param nonDefault The configuration properties specified by the caller
+ * @param ignoreGemFirePropsFile whether to skip loading distributed system properties from
+ * gemfire.properties file
+ *
* @since GemFire 6.5
*/
-
- public DistributionConfigImpl(Properties nonDefault,
- boolean ignoreGemFirePropsFile) {
+
+ public DistributionConfigImpl(Properties nonDefault, boolean ignoreGemFirePropsFile) {
this(nonDefault, ignoreGemFirePropsFile, false);
}
-
+
/**
* Creates a new <code>DistributionConfigImpl</code> with the given
* non-default configuration properties. See
* {@link com.gemstone.gemfire.distributed.DistributedSystem#connect} for a
* list of exceptions that may be thrown.
- *
- * @param nonDefault
- * The configuration properties specified by the caller
- * @param ignoreGemFirePropsFile
- * whether to skip loading distributed system properties from
- * gemfire.properties file
- * @param isConnected
- * whether to skip Validation for SSL properties and copy of ssl
- * properties to other ssl properties. This parameter will be used
- * till we provide support for ssl-* properties.
- *
+ * @param nonDefault The configuration properties specified by the caller
+ * @param ignoreGemFirePropsFile whether to skip loading distributed system properties from
+ * gemfire.properties file
+ * @param isConnected whether to skip Validation for SSL properties and copy of ssl
+ * properties to other ssl properties. This parameter will be used
+ * till we provide support for ssl-* properties.
+ *
* @since GemFire 8.0
*/
- public DistributionConfigImpl(Properties nonDefault,
- boolean ignoreGemFirePropsFile, boolean isConnected) {
+ public DistributionConfigImpl(Properties nonDefault, boolean ignoreGemFirePropsFile, boolean isConnected) {
HashMap props = new HashMap();
if (!ignoreGemFirePropsFile) {//For admin bug #40434
props.putAll(loadPropertiesFromURL(DistributedSystem.getPropertyFileURL(), false));
@@ -660,8 +757,8 @@ public class DistributionConfigImpl
}
//Now remove all user defined properties from props.
for (Object entry : props.entrySet()) {
- Map.Entry<String, String> ent = (Map.Entry<String, String>)entry;
- if (((String)ent.getKey()).startsWith(USERDEFINED_PREFIX_NAME)){
+ Map.Entry<String, String> ent = (Map.Entry<String, String>) entry;
+ if (((String) ent.getKey()).startsWith(USERDEFINED_PREFIX_NAME)) {
userDefinedProps.put(ent.getKey(), ent.getValue());
}
}
@@ -680,12 +777,10 @@ public class DistributionConfigImpl
Properties sysProps = (Properties) System.getProperties().clone();
Iterator<?> sysPropsIter = sysProps.entrySet().iterator();
while (sysPropsIter.hasNext()) {
- Map.Entry sysEntry = (Map.Entry)sysPropsIter.next();
- String sysName = (String)sysEntry.getKey();
- if (attNameSet.contains(sysName)
- || sysName.startsWith(GEMFIRE_PREFIX + SECURITY_PREFIX_NAME)
- || sysName.startsWith(GEMFIRE_PREFIX + SSL_SYSTEM_PROPS_NAME)) {
- String sysValue = (String)sysEntry.getValue();
+ Map.Entry sysEntry = (Map.Entry) sysPropsIter.next();
+ String sysName = (String) sysEntry.getKey();
+ if (attNameSet.contains(sysName) || sysName.startsWith(GEMFIRE_PREFIX + SECURITY_PREFIX_NAME) || sysName.startsWith(GEMFIRE_PREFIX + SSL_SYSTEM_PROPS_NAME)) {
+ String sysValue = (String) sysEntry.getValue();
if (sysValue != null) {
String attName = sysName.substring(GEMFIRE_PREFIX.length());
props.put(attName, sysValue);
@@ -694,7 +789,7 @@ public class DistributionConfigImpl
}
}
sysProps.clear(); //clearing cloned SysProps
-
+
final Properties overriddenDefaults = ProcessLauncherContext.getOverriddenDefaults();
if (!overriddenDefaults.isEmpty()) {
for (String key : overriddenDefaults.stringPropertyNames()) {
@@ -706,205 +801,104 @@ public class DistributionConfigImpl
}
}
}
-
- // this is case of locator and DS is started through
- // Locator.startLocatorAndDS, In this case I don't need to validate SSL
- // properties. This fix is till the time we support SSL properties. Once SSl
- // properties is depprecated, boolean isConnected will be removed
- if (!isConnected) {
- validateOldSSLVsNewSSLProperties(props);
- }
+
initialize(props);
if (securityPeerAuthInit != null && securityPeerAuthInit.length() > 0) {
- System.setProperty(SECURITY_SYSTEM_PREFIX + SECURITY_PEER_AUTH_INIT,
- securityPeerAuthInit);
+ System.setProperty(SECURITY_SYSTEM_PREFIX + SECURITY_PEER_AUTH_INIT, securityPeerAuthInit);
}
- if (securityPeerAuthenticator != null
- && securityPeerAuthenticator.length() > 0) {
- System.setProperty(SECURITY_SYSTEM_PREFIX
- + SECURITY_PEER_AUTHENTICATOR, securityPeerAuthenticator);
+ if (securityPeerAuthenticator != null && securityPeerAuthenticator.length() > 0) {
+ System.setProperty(SECURITY_SYSTEM_PREFIX + SECURITY_PEER_AUTHENTICATOR, securityPeerAuthenticator);
}
Iterator iter = security.entrySet().iterator();
while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry)iter.next();
- System.setProperty(SECURITY_SYSTEM_PREFIX + (String)entry.getKey(),
- (String)entry.getValue());
+ Map.Entry entry = (Map.Entry) iter.next();
+ System.setProperty(SECURITY_SYSTEM_PREFIX + (String) entry.getKey(), (String) entry.getValue());
}
computeMcastPortDefault();
if (!isConnected) {
- copySSLPropsToClusterSSLProps();
copySSLPropsToServerSSLProps();
copySSLPropsToJMXSSLProps();
copyClusterSSLPropsToGatewaySSLProps();
copySSLPropsToHTTPSSLProps();
}
}
-
- private void validateOldSSLVsNewSSLProperties(Map props) {
- String sslEnabledString = (String)props.get(SSL_ENABLED);
- String clusterSSLEnabledString =(String)props.get(CLUSTER_SSL_ENABLED);
- if(sslEnabledString != null && clusterSSLEnabledString != null){
- boolean sslEnabled = new Boolean(sslEnabledString).booleanValue();
- boolean clusterSSLEnabled =new Boolean(clusterSSLEnabledString).booleanValue();
- if (sslEnabled != clusterSSLEnabled) {
- throw new IllegalArgumentException(
- "GemFire properties \'ssl-enabled\' and \'cluster-ssl-enabled\' can not be used at the same time and have different values. The preferred way is to use all \'cluster-ssl*\' properties instead of \'ssl-*\'.");
- }
- }
-
- String sslCipher = (String)props.get(SSL_CIPHERS);
- String clusterSSLCipher = (String)props.get(CLUSTER_SSL_CIPHERS);
- if (sslCipher != null && clusterSSLCipher != null) {
- if ( !sslCipher.equals(clusterSSLCipher) ) {
- throw new IllegalArgumentException(
- "GemFire properties \'ssl-cipher\' and \'cluster-ssl-cipher\' can not be used at the same time and have different values. The preferred way is to use all \'cluster-ssl*\' properties instead of \'ssl-*\'.");
- }
- }
- String sslProtocol = (String)props.get(SSL_PROTOCOLS);
- String clusterSSLProtocol = (String)props.get(CLUSTER_SSL_PROTOCOLS);
- if (sslProtocol != null && clusterSSLProtocol != null) {
- if ( !sslProtocol.equals(clusterSSLProtocol) ) {
- throw new IllegalArgumentException(
- "GemFire properties \'ssl-protocols\' and \'cluster-ssl-protocols\' can not be used at the same time and have different values. The preferred way is to use all \'cluster-ssl*\' properties instead of \'ssl-*\'.");
- }
- }
-
- String sslReqAuthString = (String)props.get(SSL_REQUIRE_AUTHENTICATION);
- String clusterReqAuthString =(String)props.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION);
- if(sslReqAuthString != null && clusterReqAuthString != null){
- boolean sslReqAuth = new Boolean(sslReqAuthString).booleanValue();
- boolean clusterSSLReqAuth =new Boolean(clusterReqAuthString).booleanValue();
- if (sslReqAuth != clusterSSLReqAuth) {
- throw new IllegalArgumentException(
- "GemFire properties \'ssl-require-authentication\' and \'cluster-ssl-require-authentication\' can not be used at the same time and have different values. The preferred way is to use all \'cluster-ssl*\' properties instead of \'ssl-*\'.");
- }
- }
-
- String jmxSSLString = (String)props.get(JMX_MANAGER_SSL);
- String jmxSSLEnabledString =(String)props.get(JMX_MANAGER_SSL_ENABLED);
- if(jmxSSLString != null && jmxSSLEnabledString != null){
- boolean jmxSSL = new Boolean(jmxSSLString).booleanValue();
- boolean jmxSSLEnabled =new Boolean(jmxSSLEnabledString).booleanValue();
- if (jmxSSL != jmxSSLEnabled) {
- throw new IllegalArgumentException(
- "GemFire properties \'jmx-manager-ssl\' and \'jmx-manager-ssl-enabled\' can not be used at the same time and have different values and have different values. The preferred way is to use \'jmx-manager-ssl-enabled\' instead of \'jmx-manager-ssl\'.");
- }
- }
- }
-
- /*
- * ssl-* properties will be copied in cluster-ssl-* properties. Socket is using cluster-ssl-* properties
- */
- private void copySSLPropsToClusterSSLProps() {
- boolean clusterSSLOverriden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
- boolean p2pSSLOverRidden = this.sourceMap.get(SSL_ENABLED)!=null;
-
- if(p2pSSLOverRidden && !clusterSSLOverriden) {
- this.clusterSSLEnabled = this.sslEnabled;
- this.sourceMap.put(CLUSTER_SSL_ENABLED,this.sourceMap.get(SSL_ENABLED));
-
- if(this.sourceMap.get(SSL_CIPHERS)!=null) {
- this.clusterSSLCiphers = this.sslCiphers;
- this.sourceMap.put(CLUSTER_SSL_CIPHERS,this.sourceMap.get(SSL_CIPHERS));
- }
-
- if(this.sourceMap.get(SSL_PROTOCOLS)!=null) {
- this.clusterSSLProtocols = this.sslProtocols;
- this.sourceMap.put(CLUSTER_SSL_PROTOCOLS,this.sourceMap.get(SSL_PROTOCOLS));
- }
-
- if(this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION)!=null) {
- this.clusterSSLRequireAuthentication = this.sslRequireAuthentication;
- this.sourceMap.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(SSL_REQUIRE_AUTHENTICATION));
- }
- this.clusterSSLProperties.putAll(this.sslProperties);
- }
- }
-
/*
* if jmx-manager-ssl is true and jmx-manager-ssl-enabled is false then override jmx-manager-ssl-enabled with jmx-manager-ssl
* if jmx-manager-ssl-enabled is false, then use the properties from cluster-ssl-* properties
* if jmx-manager-ssl-*properties are given then use them, and copy the unspecified jmx-manager properties from cluster-properties
*/
private void copySSLPropsToJMXSSLProps() {
- boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED)!=null;
- boolean jmxSSLOverriden = this.sourceMap.get(JMX_MANAGER_SSL)!=null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
-
- if(jmxSSLOverriden && !jmxSSLEnabledOverriden) {
- this.jmxManagerSSLEnabled = this.jmxManagerSSL;
- this.sourceMap.put(JMX_MANAGER_SSL_ENABLED,this.sourceMap.get(JMX_MANAGER_SSL));
- }
-
- if(clusterSSLOverRidden && !jmxSSLOverriden && !jmxSSLEnabledOverriden) {
- this.jmxManagerSSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(JMX_MANAGER_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED));
- if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) {
+ boolean jmxSSLEnabledOverriden = this.sourceMap.get(JMX_MANAGER_SSL_ENABLED) != null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+
+ if (clusterSSLOverRidden && !jmxSSLEnabledOverriden) {
+ this.jmxManagerSSLEnabled = this.clusterSSLEnabled;
+ this.sourceMap.put(JMX_MANAGER_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
+ if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
this.jmxManagerSslCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(JMX_MANAGER_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS));
+ this.sourceMap.put(JMX_MANAGER_SSL_CIPHERS, this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
-
- if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) {
+
+ if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS) != null) {
this.jmxManagerSslProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(JMX_MANAGER_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
+ this.sourceMap.put(JMX_MANAGER_SSL_PROTOCOLS, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
-
- if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) {
+
+ if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION) != null) {
this.jmxManagerSslRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
- }
+ this.sourceMap.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
+ }
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.jmxManagerSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.jmxManagerSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.jmxManagerSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) {
- this.jmxManagerSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ this.jmxManagerSSLTrustStore = this.clusterSSLTrustStore;
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) {
- this.jmxManagerSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ this.jmxManagerSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.jmxManagerSslProperties.putAll(this.clusterSSLProperties);
- }
-
- if(jmxSSLOverriden || jmxSSLEnabledOverriden){
- if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
+ }
+
+ if (jmxSSLEnabledOverriden) {
+ if (this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.jmxManagerSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
+ if (this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_TYPE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.jmxManagerSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
+ if (this.sourceMap.get(JMX_MANAGER_SSL_KEYSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.jmxManagerSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
- this.jmxManagerSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
+ if (this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ this.jmxManagerSSLTrustStore = this.clusterSSLTrustStore;
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
- this.jmxManagerSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ if (this.sourceMap.get(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ this.jmxManagerSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+ this.sourceMap.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
-
}
-
+
/*
* if http-service-ssl-enabled is false, then use the properties from cluster-ssl-* properties
* if http-service-ssl-*properties are given then use them, and copy the unspecified http-service properties from cluster-properties
@@ -930,8 +924,7 @@ public class DistributionConfigImpl
if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION) != null) {
this.httpServiceSSLRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
- this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
+ this.sourceMap.put(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
}
if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
@@ -944,8 +937,7 @@ public class DistributionConfigImpl
}
if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,
- this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
this.httpServiceSSLTrustStore = this.clusterSSLTrustStore;
@@ -953,42 +945,34 @@ public class DistributionConfigImpl
}
if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,
- this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.httpServiceSSLProperties.putAll(this.clusterSSLProperties);
}
if (httpServiceSSLEnabledOverriden) {
- if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE) == null
- && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.httpServiceSSLKeyStore = this.clusterSSLKeyStore;
this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_TYPE) == null
- && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_TYPE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.httpServiceSSLKeyStoreType = this.clusterSSLKeyStoreType;
this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD) == null
- && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,
- this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE) == null
- && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
this.httpServiceSSLTrustStore = this.clusterSSLTrustStore;
this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD) == null
- && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ if (this.sourceMap.get(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
- this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,
- this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
-
+
}
/*
@@ -996,70 +980,70 @@ public class DistributionConfigImpl
* if server-ssl-*properties are given then use them, and copy the unspecified server properties from cluster-properties
*/
private void copySSLPropsToServerSSLProps() {
- boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED)!=null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
-
- if(clusterSSLOverRidden && !cacheServerSSLOverriden) {
- this.serverSSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(SERVER_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED));
- if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) {
+ boolean cacheServerSSLOverriden = this.sourceMap.get(SERVER_SSL_ENABLED) != null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+
+ if (clusterSSLOverRidden && !cacheServerSSLOverriden) {
+ this.serverSSLEnabled = this.clusterSSLEnabled;
+ this.sourceMap.put(SERVER_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
+ if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
this.serverSslCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(SERVER_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS));
+ this.sourceMap.put(SERVER_SSL_CIPHERS, this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
-
- if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) {
+
+ if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS) != null) {
this.serverSslProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(SERVER_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
+ this.sourceMap.put(SERVER_SSL_PROTOCOLS, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
-
- if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) {
+
+ if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION) != null) {
this.serverSslRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(SERVER_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
- }
+ this.sourceMap.put(SERVER_SSL_REQUIRE_AUTHENTICATION, this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
+ }
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.serverSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(SERVER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.serverSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.serverSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) {
- this.serverSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ this.serverSSLTrustStore = this.clusterSSLTrustStore;
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) {
- this.serverSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ this.serverSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.serverSslProperties.putAll(this.clusterSSLProperties);
- }
-
- if(cacheServerSSLOverriden){
- if(this.sourceMap.get(SERVER_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
+ }
+
+ if (cacheServerSSLOverriden) {
+ if (this.sourceMap.get(SERVER_SSL_KEYSTORE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.serverSSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(SERVER_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(SERVER_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
+ if (this.sourceMap.get(SERVER_SSL_KEYSTORE_TYPE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.serverSSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(SERVER_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
+ if (this.sourceMap.get(SERVER_SSL_KEYSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.serverSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(SERVER_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
- this.serverSSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
+ if (this.sourceMap.get(SERVER_SSL_TRUSTSTORE) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ this.serverSSLTrustStore = this.clusterSSLTrustStore;
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(SERVER_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
- this.serverSSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ if (this.sourceMap.get(SERVER_SSL_TRUSTSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ this.serverSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+ this.sourceMap.put(SERVER_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
}
@@ -1069,88 +1053,88 @@ public class DistributionConfigImpl
* if gateway-ssl-*properties are given then use them, and copy the unspecified gateway properties from cluster-properties
*/
private void copyClusterSSLPropsToGatewaySSLProps() {
- boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED)!=null;
- boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED)!=null;
-
- if(clusterSSLOverRidden && !gatewaySSLOverriden) {
- this.gatewaySSLEnabled = this.clusterSSLEnabled;
- this.sourceMap.put(GATEWAY_SSL_ENABLED,this.sourceMap.get(CLUSTER_SSL_ENABLED));
- if(this.sourceMap.get(CLUSTER_SSL_CIPHERS)!=null) {
+ boolean gatewaySSLOverriden = this.sourceMap.get(GATEWAY_SSL_ENABLED) != null;
+ boolean clusterSSLOverRidden = this.sourceMap.get(CLUSTER_SSL_ENABLED) != null;
+
+ if (clusterSSLOverRidden && !gatewaySSLOverriden) {
+ this.gatewaySSLEnabled = this.clusterSSLEnabled;
+ this.sourceMap.put(GATEWAY_SSL_ENABLED, this.sourceMap.get(CLUSTER_SSL_ENABLED));
+ if (this.sourceMap.get(CLUSTER_SSL_CIPHERS) != null) {
this.gatewaySslCiphers = this.clusterSSLCiphers;
- this.sourceMap.put(GATEWAY_SSL_CIPHERS,this.sourceMap.get(CLUSTER_SSL_CIPHERS));
+ this.sourceMap.put(GATEWAY_SSL_CIPHERS, this.sourceMap.get(CLUSTER_SSL_CIPHERS));
}
-
- if(this.sourceMap.get(CLUSTER_SSL_PROTOCOLS)!=null) {
+
+ if (this.sourceMap.get(CLUSTER_SSL_PROTOCOLS) != null) {
this.gatewaySslProtocols = this.clusterSSLProtocols;
- this.sourceMap.put(GATEWAY_SSL_PROTOCOLS,this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
+ this.sourceMap.put(GATEWAY_SSL_PROTOCOLS, this.sourceMap.get(CLUSTER_SSL_PROTOCOLS));
}
-
- if(this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION)!=null) {
+
+ if (this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION) != null) {
this.gatewaySslRequireAuthentication = this.clusterSSLRequireAuthentication;
- this.sourceMap.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION,this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
- }
+ this.sourceMap.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, this.sourceMap.get(CLUSTER_SSL_REQUIRE_AUTHENTICATION));
+ }
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.gatewaySSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.gatewaySSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD)!=null) {
+ if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.gatewaySSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!=null) {
- this.gatewaySSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ this.gatewaySSLTrustStore = this.clusterSSLTrustStore;
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD)!=null) {
- this.gatewaySSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ this.gatewaySSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
this.gatewaySslProperties.putAll(this.clusterSSLProperties);
- }
-
- if(gatewaySSLOverriden){
- if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
+ }
+
+ if (gatewaySSLOverriden) {
+ if (this.sourceMap.get(GATEWAY_SSL_KEYSTORE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
this.gatewaySSLKeyStore = this.clusterSSLKeyStore;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
}
- if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_TYPE)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
+ if (this.sourceMap.get(GATEWAY_SSL_KEYSTORE_TYPE) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
this.gatewaySSLKeyStoreType = this.clusterSSLKeyStoreType;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
}
- if(this.sourceMap.get(GATEWAY_SSL_KEYSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
+ if (this.sourceMap.get(GATEWAY_SSL_KEYSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
this.gatewaySSLKeyStorePassword = this.clusterSSLKeyStorePassword;
- this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
+ this.sourceMap.put(GATEWAY_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
}
- if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE)!= null) {
- this.gatewaySSLTrustStore= this.clusterSSLTrustStore;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
+ if (this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
+ this.gatewaySSLTrustStore = this.clusterSSLTrustStore;
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
}
- if(this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD)==null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
- this.gatewaySSLTrustStorePassword= this.clusterSSLTrustStorePassword;
- this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+ if (this.sourceMap.get(GATEWAY_SSL_TRUSTSTORE_PASSWORD) == null && this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
+ this.gatewaySSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+ this.sourceMap.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
}
}
}
-
-
+
+
private void computeMcastPortDefault() {
// a no-op since multicast discovery has been removed
// and the default mcast port is now zero
// ConfigSource cs = getAttSourceMap().get(ConfigurationProperties.MCAST_PORT);
-// if (cs == null) {
-// String locators = getLocators();
-// if (locators != null && !locators.isEmpty()) {
-// this.mcastPort = 0; // fixes 46308
-// }
-// }
+ // if (cs == null) {
+ // String locators = getLocators();
+ // if (locators != null && !locators.isEmpty()) {
+ // this.mcastPort = 0; // fixes 46308
+ // }
+ // }
}
-
+
/**
* Produce a DistributionConfigImpl for the given properties and return it.
*/
@@ -1163,7 +1147,7 @@ public class DistributionConfigImpl
}
return new DistributionConfigImpl(props, false, false);
}
-
+
/**
* Produce a DistributionConfigImpl for the given properties and return it.
*/
@@ -1183,13 +1167,13 @@ public class DistributionConfigImpl
this.modifiable = true;
Iterator it = apiProps.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry me = (Map.Entry)it.next();
- String propName = (String)me.getKey();
+ Map.Entry me = (Map.Entry) it.next();
+ String propName = (String) me.getKey();
this.props.put(propName, me.getValue());
if (specialPropName(propName)) {
continue;
}
- String propVal = (String)me.getValue();
+ String propVal = (String) me.getValue();
if (propVal != null) {
this.setAttribute(propName, propVal.trim(), this.sourceMap.get(propName));
}
@@ -1199,19 +1183,18 @@ public class DistributionConfigImpl
this.modifiable = false;
}
}
-
+
public static boolean specialPropName(String propName) {
- return propName.equalsIgnoreCase(SSL_ENABLED) ||
- propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED) ||
- propName.equals(SECURITY_PEER_AUTH_INIT) ||
- propName.equals(SECURITY_PEER_AUTHENTICATOR) ||
- propName.equals(LOG_WRITER_NAME) ||
- propName.equals(DS_CONFIG_NAME) ||
- propName.equals(SECURITY_LOG_WRITER_NAME) ||
- propName.equals(LOG_OUTPUTSTREAM_NAME) ||
- propName.equals(SECURITY_LOG_OUTPUTSTREAM_NAME);
- }
-
+ return propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED) ||
+ propName.equals(SECURITY_PEER_AUTH_INIT) ||
+ propName.equals(SECURITY_PEER_AUTHENTICATOR) ||
+ propName.equals(LOG_WRITER_NAME) ||
+ propName.equals(DS_CONFIG_NAME) ||
+ propName.equals(SECURITY_LOG_WRITER_NAME) ||
+ propName.equals(LOG_OUTPUTSTREAM_NAME) ||
+ propName.equals(SECURITY_LOG_OUTPUTSTREAM_NAME);
+ }
+
@Override
protected Map<String, ConfigSource> getAttSourceMap() {
return this.sourceMap;
@@ -1224,31 +1207,25 @@ public class DistributionConfigImpl
/**
* Loads the properties from gemfire.properties & gfsecurity.properties files
* into given Properties object.
- *
- * @param p
- * the Properties to fill in
- * @throws GemFireIOException
- * when error occurs while reading properties file
+ * @param p the Properties to fill in
+ *
+ * @throws GemFireIOException when error occurs while reading properties file
*/
public static void loadGemFireProperties(Properties p) throws GemFireIOException {
loadGemFireProperties(p, false);
}
-
+
/**
* Loads the properties from gemfire.properties & gfsecurity.properties files
* into given Properties object. if <code>ignoreGemFirePropsFile</code> is
* <code>true</code>, properties are not read from gemfire.properties.
- *
- * @param p
- * the Properties to fill in
- * @param ignoreGemFirePropsFile
- * whether to ignore properties from gemfire.properties
- * @throws GemFireIOException
- * when error occurs while reading properties file
+ * @param p the Properties to fill in
+ * @param ignoreGemFirePropsFile whether to ignore properties from gemfire.properties
+ *
+ * @throws GemFireIOException when error occurs while reading properties file
*/
// Fix for #44924
- public static void loadGemFireProperties(Properties p,
- boolean ignoreGemFirePropsFile) throws GemFireIOException {
+ public static void loadGemFireProperties(Properties p, boolean ignoreGemFirePropsFile) throws GemFireIOException {
if (!ignoreGemFirePropsFile) {
loadPropertiesFromURL(p, DistributedSystem.getPropertyFileURL());
}
@@ -1263,11 +1240,11 @@ public class DistributionConfigImpl
if (source == null) {
throw new IllegalArgumentException("Valid ConfigSource must be specified instead of null.");
}
- for (Object k: p.keySet()) {
- this.sourceMap.put((String)k, source);
+ for (Object k : p.keySet()) {
+ this.sourceMap.put((String) k, source);
}
}
-
+
private Properties loadPropertiesFromURL(URL url, boolean secure) {
Properties result = new Properties();
loadPropertiesFromURL(result, url);
@@ -1276,7 +1253,7 @@ public class DistributionConfigImpl
}
return result;
}
-
+
private static void loadPropertiesFromURL(Properties p, URL url) {
if (url != null) {
try {
@@ -1286,43 +1263,35 @@ public class DistributionConfigImpl
}
}
}
-
+
private void initialize(Map props) {
// Allow attributes to be modified
this.modifiable = true;
this.props = props;
Iterator it = props.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry me = (Map.Entry)it.next();
- String propName = (String)me.getKey();
+ Map.Entry me = (Map.Entry) it.next();
+ String propName = (String) me.getKey();
// if ssl-enabled is set to true before the mcast port is set to 0, then it will error.
// security should not be enabled before the mcast port is set to 0.
if (specialPropName(propName)) {
continue;
}
Object propVal = me.getValue();
- if (propVal != null && (propVal instanceof String)) { // weed out extraneous non-string properties
- this.setAttribute(propName, ((String)propVal).trim(), this.sourceMap.get(propName));
+ if (propVal != null && (propVal instanceof String)) { // weed out extraneous non-string properties
+ this.setAttribute(propName, ((String) propVal).trim(), this.sourceMap.get(propName));
}
}
- // now set ssl-enabled if needed...
- if ( props.containsKey(SSL_ENABLED) ) {
- this.setAttribute(SSL_ENABLED, (String) props.get( SSL_ENABLED ), this.sourceMap.get(SSL_ENABLED) );
- }
- if ( props.containsKey(CLUSTER_SSL_ENABLED) ) {
- this.setAttribute(CLUSTER_SSL_ENABLED, (String) props.get( CLUSTER_SSL_ENABLED ), this.sourceMap.get(CLUSTER_SSL_ENABLED) );
+ if (props.containsKey(CLUSTER_SSL_ENABLED)) {
+ this.setAttribute(CLUSTER_SSL_ENABLED, (String) props.get(CLUSTER_SSL_ENABLED), this.sourceMap.get(CLUSTER_SSL_ENABLED));
}
// now set the security authInit if needed
if (props.containsKey(SECURITY_PEER_AUTH_INIT)) {
- this.setAttribute(SECURITY_PEER_AUTH_INIT, (String)props
- .get(SECURITY_PEER_AUTH_INIT),
- this.sourceMap.get(SECURITY_PEER_AUTH_INIT));
+ this.setAttribute(SECURITY_PEER_AUTH_INIT, (String) props.get(SECURITY_PEER_AUTH_INIT), this.sourceMap.get(SECURITY_PEER_AUTH_INIT));
}
// and security authenticator if needed
if (props.containsKey(SECURITY_PEER_AUTHENTICATOR)) {
- this.setAttribute(SECURITY_PEER_AUTHENTICATOR, (String)props
- .get(SECURITY_PEER_AUTHENTICATOR),
- this.sourceMap.get(SECURITY_PEER_AUTHENTICATOR));
+ this.setAttribute(SECURITY_PEER_AUTHENTICATOR, (String) props.get(SECURITY_PEER_AUTHENTICATOR), this.sourceMap.get(SECURITY_PEER_AUTHENTICATOR));
}
// Make attributes read only
@@ -1337,7 +1306,7 @@ public class DistributionConfigImpl
Iterator iter = security.keySet().iterator();
while (iter.hasNext()) {
- props.remove(SECURITY_SYSTEM_PREFIX + (String)iter.next());
+ props.remove(SECURITY_SYSTEM_PREFIX + (String) iter.next());
}
System.setProperties(props);
}
@@ -1355,35 +1324,39 @@ public class DistributionConfigImpl
public int getMcastPort() {
return this.mcastPort;
}
+
public int getMcastTtl() {
return this.mcastTtl;
}
+
public int getSocketLeaseTime() {
return this.socketLeaseTime;
}
+
public int getSocketBufferSize() {
return this.socketBufferSize;
}
+
public boolean getConserveSockets() {
return this.conserveSockets;
}
+
public String getRoles() {
return this.roles;
}
- public int getMaxWaitTimeForReconnect(){
- return this.maxWaitTimeForReconnect;
+ public int getMaxWaitTimeForReconnect() {
+ return this.maxWaitTimeForReconnect;
}
- public int getMaxNumReconnectTries(){
+ public int getMaxNumReconnectTries() {
return this.maxNumReconnectTries;
}
public InetAddress getMcastAddress() {
try {
return this.mcastAddress;
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -1420,12 +1393,11 @@ public class DistributionConfigImpl
public String getStartLocator() {
if (this.startLocatorPort > 0) {
if (this.bindAddress != null) {
- return this.bindAddress + "["+this.startLocatorPort+"]";
+ return this.bindAddress + "[" + this.startLocatorPort + "]";
}
try {
- return SocketCreator.getHostName(SocketCreator.getLocalHost()) + "["+this.startLocatorPort+"]";
- }
- catch (UnknownHostException e) {
+ return SocketCreator.getHostName(SocketCreator.getLocalHost()) + "[" + this.startLocatorPort + "]";
+ } catch (UnknownHostException e) {
// punt and use this.startLocator instead
}
}
@@ -1468,63 +1440,50 @@ public class DistributionConfigImpl
return this.cacheXmlFile;
}
- public boolean getSSLEnabled( ) {
- return this.sslEnabled;
- }
-
- public String getSSLProtocols( ) {
- return this.sslProtocols;
- }
-
- public String getSSLCiphers( ) {
- return this.sslCiphers;
- }
-
- public boolean getSSLRequireAuthentication( ) {
- return this.sslRequireAuthentication;
- }
-
- public boolean getClusterSSLEnabled( ) {
+ public boolean getClusterSSLEnabled() {
return this.clusterSSLEnabled;
}
- public String getClusterSSLProtocols( ) {
+ public String getClusterSSLProtocols() {
return this.clusterSSLProtocols;
}
- public String getClusterSSLCiphers( ) {
+ public String getClusterSSLCiphers() {
return this.clusterSSLCiphers;
}
- public boolean getClusterSSLRequireAuthentication( ) {
+ public boolean getClusterSSLRequireAuthentication() {
return this.clusterSSLRequireAuthentication;
}
-
- public String getClusterSSLKeyStore( ){
+
+ public String getClusterSSLKeyStore() {
return this.clusterSSLKeyStore;
}
- public String getClusterSSLKeyStoreType( ){
+
+ public String getClusterSSLKeyStoreType() {
return this.clusterSSLKeyStoreType;
}
-
- public String getClusterSSLKeyStorePassword( ){
+
+ public String getClusterSSLKeyStorePassword() {
return this.clusterSSLKeyStorePassword;
}
-
- public String getClusterSSLTrustStore( ){
+
+ public String getClusterSSLTrustStore() {
return this.clusterSSLTrustStore;
}
-
- public String getClusterSSLTrustStorePassword( ){
+
+ public String getClusterSSLTrustStorePassword() {
return this.clusterSSLTrustStorePassword;
}
-
+
public int getAsyncDistributionTimeout() {
return this.asyncDistributionTimeout;
}
+
public int getAsyncQueueTimeout() {
return this.asyncQueueTimeout;
}
+
public int getAsyncMaxQueueSize() {
return this.asyncMaxQueueSize;
}
@@ -1532,33 +1491,33 @@ public class DistributionConfigImpl
public String getUserCommandPackages() {
return this.userCommandPackages;
}
-
+
public int getHttpServicePort() {
return this.httpServicePort;
}
public void setHttpServicePort(int value) {
- this.httpServicePort = (Integer)checkAttribute(HTTP_SERVICE_PORT, value);
+ this.httpServicePort = (Integer) checkAttribute(HTTP_SERVICE_PORT, value);
}
-
+
public String getHttpServiceBindAddress() {
return this.httpServiceBindAddress;
}
-
+
public void setHttpServiceBindAddress(String value) {
- this.httpServiceBindAddress = (String)checkAttribute(HTTP_SERVICE_BIND_ADDRESS, value);
+ this.httpServiceBindAddress = (String) checkAttribute(HTTP_SERVICE_BIND_ADDRESS, value);
}
-
- public boolean getStartDevRestApi(){
+
+ public boolean getStartDevRestApi() {
return this.startDevRestApi;
}
-
- public void setStartDevRestApi(boolean value){
+
+ public void setStartDevRestApi(boolean value) {
this.startDevRestApi = value;
}
-
+
public void setUserCommandPackages(String value) {
- this.userCommandPackages = (String)checkAttribute(USER_COMMAND_PACKAGES, value);
+ this.userCommandPackages = (String) checkAttribute(USER_COMMAND_PACKAGES, value);
}
public boolean getDeltaPropagation() {
@@ -1566,7 +1525,7 @@ public class DistributionConfigImpl
}
public void setDeltaPropagation(boolean value) {
- this.deltaPropagation = (Boolean)checkAttribute(DELTA_PROPAGATION, value);
+ this.deltaPropagation = (Boolean) checkAttribute(DELTA_PROPAGATION, value);
}
public void setName(String value) {
@@ -1575,69 +1534,82 @@ public class DistributionConfigImpl
}
this.name = (String) checkAttribute(NAME, value);
}
+
public void setTcpPort(int value) {
this.tcpPort = (Integer) checkAttribute(TCP_PORT, value);
}
+
public void setMcastPort(int value) {
this.mcastPort = (Integer) checkAttribute(MCAST_PORT, value);
}
+
public void setMcastTtl(int value) {
this.mcastTtl = (Integer) checkAttribute(MCAST_TTL, value);
}
+
public void setSocketLeaseTime(int value) {
- this.socketLeaseTime = (Integer)checkAttribute(SOCKET_LEASE_TIME, value);
+ this.socketLeaseTime = (Integer) checkAttribute(SOCKET_LEASE_TIME, value);
}
+
public void setSocketBufferSize(int value) {
- this.socketBufferSize = (Integer)checkAttribute(SOCKET_BUFFER_SIZE, value);
+ this.socketBufferSize = (Integer) checkAttribute(SOCKET_BUFFER_SIZE, value);
}
+
public void setConserveSockets(boolean value) {
- this.conserveSockets = (Boolean)checkAttribute(CONSERVE_SOCKETS, value);
+ this.conserveSockets = (Boolean) checkAttribute(CONSERVE_SOCKETS, value);
}
+
public void setRoles(String value) {
- this.roles = (String)checkAttribute(ROLES, value);
+ this.roles = (String) checkAttribute(ROLES, value);
}
- public void setMaxWaitTimeForReconnect(int value){
+ public void setMaxWaitTimeForReconnect(int value) {
this.maxWaitTimeForReconnect = value;
}
- public void setMaxNumReconnectTries(int value){
+ public void setMaxNumReconnectTries(int value) {
this.maxNumReconnectTries = value;
}
public void setMcastAddress(InetAddress value) {
this.mcastAddress = (InetAddress) checkAttribute(MCAST_ADDRESS, value);
}
+
public void setBindAddress(String value) {
this.bindAddress = (String) checkAttribute(BIND_ADDRESS, value);
}
+
public void setServerBindAddress(String 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, value);
}
-
+
public void setLocatorWaitTime(int value) {
this.locatorWaitTime = value;
}
-
+
public int getLocatorWaitTime() {
return this.locatorWaitTime;
}
-
+
public void setDeployWorkingDir(File value) {
- this.deployWorkingDir = (File)checkAttribute(DEPLOY_WORKING_DIR, value);
+ this.deployWorkingDir = (File) checkAttribute(DEPLOY_WORKING_DIR, value);
}
+
public void setLogFile(File value) {
- this.logFile = (File)checkAttribute(LOG_FILE, value);
+ this.logFile = (File) checkAttribute(LOG_FILE, value);
}
+
public void setLogLevel(int value) {
- this.logLevel = (Integer)checkAttribute(LOG_LEVEL, value);
+ this.logLevel = (Integer) checkAttribute(LOG_LEVEL, value);
}
+
/**
* the locator startup code must be able to modify the locator log file in order
* to establish a default log file if one hasn't been specified by the user.
@@ -1647,15 +1619,15 @@ public class DistributionConfigImpl
public void unsafeSetLogFile(File value) {
this.logFile = value;
}
+
public void setStartLocator(String value) {
startLocatorPort = 0;
if (value == null) {
value = DEFAULT_START_LOCATOR;
- }
- else {
+ } else {
// bug 37938 - allow just a port
boolean alldigits = true;
- for (int i=0; i<value.length(); i++) {
+ for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
<TRUNCATED>
[20/33] incubator-geode git commit: GEODE-11: Passing down
defaultField to query parser
Posted by ud...@apache.org.
GEODE-11: Passing down defaultField to query parser
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d5dae19b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d5dae19b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d5dae19b
Branch: refs/heads/feature/GEODE-420
Commit: d5dae19b2d595403ddc1d2344e5fa3cf0bbc32a6
Parents: 79cba4d
Author: Jason Huynh <hu...@gmail.com>
Authored: Tue Jun 14 08:13:07 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Tue Jun 14 14:56:42 2016 -0700
----------------------------------------------------------------------
.../cache/lucene/LuceneQueryFactory.java | 3 +-
.../cache/lucene/LuceneQueryProvider.java | 1 +
.../lucene/internal/LuceneQueryFactoryImpl.java | 4 +--
.../cache/lucene/internal/LuceneQueryImpl.java | 3 +-
.../lucene/internal/StringQueryProvider.java | 11 +++++--
...IndexCreationPersistenceIntegrationTest.java | 33 ++++++++++----------
.../LuceneIndexMaintenanceIntegrationTest.java | 14 ++++-----
.../gemfire/cache/lucene/LuceneQueriesBase.java | 29 ++++++++++++++++-
.../lucene/LuceneQueriesIntegrationTest.java | 27 ++++++++--------
...LuceneQueriesPersistenceIntegrationTest.java | 15 +--------
.../LuceneQueryFactoryImplJUnitTest.java | 6 ++--
.../LuceneQueryImplIntegrationTest.java | 5 ++-
.../internal/StringQueryProviderJUnitTest.java | 19 ++++++++---
.../LuceneFunctionContextJUnitTest.java | 3 +-
.../distributed/LuceneFunctionJUnitTest.java | 4 +--
.../TopEntriesFunctionCollectorJUnitTest.java | 6 ++--
.../IndexRepositoryImplPerformanceTest.java | 2 +-
.../cache/lucene/test/LuceneTestUtilities.java | 1 +
18 files changed, 109 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index 198961a..a7844a2 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -76,12 +76,13 @@ public interface LuceneQueryFactory {
* @param regionName region name
* @param indexName index name
* @param queryString query string in lucene QueryParser's syntax
+ * @param defaultField default field used by the Lucene Query Parser
* @param <K> the key type in the query results
* @param <V> the value type in the query results
* @return LuceneQuery object
* @throws ParseException
*/
- public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString)
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString, String defaultField)
throws ParseException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
index ef60158..92a3a1c 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
@@ -42,4 +42,5 @@ public interface LuceneQueryProvider extends Serializable {
* @throws QueryException if the provider fails to construct the query object
*/
public Query getQuery(LuceneIndex index) throws QueryException;
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
index 385b226..62b4f56 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImpl.java
@@ -48,8 +48,8 @@ public class LuceneQueryFactoryImpl implements LuceneQueryFactory {
}
@Override
- public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString) {
- return create(indexName, regionName, new StringQueryProvider(queryString));
+ public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, String queryString, String defaultField) {
+ return create(indexName, regionName, new StringQueryProvider(queryString, defaultField));
}
public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, LuceneQueryProvider provider) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
index a876b40..c6b8878 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java
@@ -42,8 +42,9 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
/* the lucene Query object to be wrapped here */
private LuceneQueryProvider query;
private Region<K, V> region;
+ private String defaultField;
- public LuceneQueryImpl(String indexName, Region<K, V> region, LuceneQueryProvider provider, String[] projectionFields,
+ public LuceneQueryImpl(String indexName, Region<K, V> region, LuceneQueryProvider provider, String[] projectionFields,
int limit, int pageSize) {
this.indexName = indexName;
this.region = region;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
index 2ccd58d..3f121ec 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProvider.java
@@ -52,12 +52,15 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
// the following members hold derived objects and need not be serialized
private transient Query luceneQuery;
+ private String defaultField;
+
public StringQueryProvider() {
- this(null);
+ this(null, null);
}
- public StringQueryProvider(String query) {
+ public StringQueryProvider(String query, String defaultField) {
this.query = query;
+ this.defaultField = defaultField;
}
@Override
@@ -68,7 +71,7 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
LuceneIndexImpl indexImpl = (LuceneIndexImpl) index;
StandardQueryParser parser = new StandardQueryParser(indexImpl.getAnalyzer());
try {
- luceneQuery = parser.parse(query, fields[0]);
+ luceneQuery = parser.parse(query, defaultField);
if (logger.isDebugEnabled()) {
logger.debug("User query " + query + " is parsed to be: " + luceneQuery);
}
@@ -100,10 +103,12 @@ public class StringQueryProvider implements LuceneQueryProvider, DataSerializabl
@Override
public void toData(DataOutput out) throws IOException {
DataSerializer.writeString(query, out);
+ DataSerializer.writeString(defaultField, out);
}
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
query = DataSerializer.readString(in);
+ defaultField = DataSerializer.readString(in);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
index 26426ca..552278e 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
@@ -20,13 +20,22 @@ package com.gemstone.gemfire.cache.lucene;
import static com.gemstone.gemfire.cache.RegionShortcut.*;
import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*;
-import static junitparams.JUnitParamsRunner.$;
+import static junitparams.JUnitParamsRunner.*;
import static org.junit.Assert.*;
import java.io.File;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
+import com.jayway.awaitility.Awaitility;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
@@ -36,16 +45,6 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.test.junit.rules.DiskDirRule;
-import com.jayway.awaitility.Awaitility;
-
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
/**
* Tests of lucene index creation that use persistence
@@ -109,7 +108,7 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
verifyIndexFinishFlushing(cache, INDEX_NAME, REGION_NAME);
LuceneQuery<Object, Object> query = luceneService.createLuceneQueryFactory()
.create(INDEX_NAME, REGION_NAME,
- "field1:world");
+ "field1:world", DEFAULT_FIELD);
assertEquals(1, query.search().size());
}
@@ -127,7 +126,7 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
.create(REGION_NAME);
LuceneQuery<Object, Object> query = luceneService.createLuceneQueryFactory()
.create(INDEX_NAME, REGION_NAME,
- "field1:world");
+ "field1:world", DEFAULT_FIELD);
assertEquals(1, query.search().size());
}
@@ -138,8 +137,8 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
LuceneServiceProvider.get(this.cache).createIndex(INDEX_NAME+"_2", REGION_NAME, "field2");
Region region = cache.createRegionFactory(shortcut).create(REGION_NAME);
region.put("key1", new TestObject());
- verifyQueryResultSize(INDEX_NAME+"_1", REGION_NAME, "field1:world", 1);
- verifyQueryResultSize(INDEX_NAME+"_2", REGION_NAME, "field2:field", 1);
+ verifyQueryResultSize(INDEX_NAME+"_1", REGION_NAME, "field1:world", DEFAULT_FIELD, 1);
+ verifyQueryResultSize(INDEX_NAME+"_2", REGION_NAME, "field2:field", DEFAULT_FIELD, 1);
}
@Test
@@ -160,8 +159,8 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
});
}
- private void verifyQueryResultSize(String indexName, String regionName, String queryString, int size) throws ParseException {
- LuceneQuery query = luceneService.createLuceneQueryFactory().create(indexName, regionName, queryString);
+ private void verifyQueryResultSize(String indexName, String regionName, String queryString, String defaultField, int size) throws ParseException {
+ LuceneQuery query = luceneService.createLuceneQueryFactory().create(indexName, regionName, queryString, defaultField);
Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> {
assertEquals(size, query.search().size());
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
index af8c51f..05b6990 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
@@ -24,16 +24,16 @@ import static org.junit.Assert.*;
import java.io.Serializable;
import java.util.concurrent.TimeUnit;
+import com.jayway.awaitility.Awaitility;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexForPartitionedRegion;
import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexStats;
import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystemStats;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-import com.jayway.awaitility.Awaitility;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
@Category(IntegrationTest.class)
public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest {
@@ -52,7 +52,7 @@ public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest
LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
index.waitUntilFlushed(WAIT_FOR_FLUSH_TIME);
- LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"");
+ LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"", DEFAULT_FIELD);
LuceneQueryResults<Integer, TestObject> results = query.search();
assertEquals(3, results.size());
@@ -75,7 +75,7 @@ public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest
LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
index.waitUntilFlushed(WAIT_FOR_FLUSH_TIME);
- LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"");
+ LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"", DEFAULT_FIELD);
LuceneQueryResults<Integer, TestObject> results = query.search();
assertEquals(3, results.size());
@@ -99,7 +99,7 @@ public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest
LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
index.waitUntilFlushed(WAIT_FOR_FLUSH_TIME);
- LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"");
+ LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"", DEFAULT_FIELD);
LuceneQueryResults<Integer, TestObject> results = query.search();
assertEquals(3, results.size());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
index 92d8e8b..26cd4aa 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java
@@ -70,6 +70,21 @@ public abstract class LuceneQueriesBase extends LuceneDUnitTest {
}
@Test
+ public void defaultFieldShouldPropogateCorrectlyThroughFunction() {
+ SerializableRunnableIF createIndex = () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, "text");
+ };
+ dataStore1.invoke(() -> initDataStore(createIndex));
+ dataStore2.invoke(() -> initDataStore(createIndex));
+ accessor.invoke(() -> initAccessor(createIndex));
+ putDataInRegion(accessor);
+ assertTrue(waitForFlushBeforeExecuteTextSearch(accessor, 60000));
+ executeTextSearch(accessor, "world", "text", 3);
+ executeTextSearch(accessor, "world", "noEntriesMapped", 0);
+ }
+
+ @Test
public void entriesFlushedToIndexAfterWaitForFlushCalled() {
SerializableRunnableIF createIndex = () -> {
LuceneService luceneService = LuceneServiceProvider.get(getCache());
@@ -108,7 +123,7 @@ public abstract class LuceneQueriesBase extends LuceneDUnitTest {
LuceneService service = LuceneServiceProvider.get(cache);
LuceneQuery<Integer, TestObject> query;
- query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world");
+ query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world", DEFAULT_FIELD);
LuceneQueryResults<Integer, TestObject> results = query.search();
assertEquals(3, results.size());
List<LuceneResultStruct<Integer, TestObject>> page = results.getNextPage();
@@ -123,6 +138,18 @@ public abstract class LuceneQueriesBase extends LuceneDUnitTest {
});
}
+ protected void executeTextSearch(VM vm, String queryString, String defaultField, int expectedResultsSize) {
+ vm.invoke(() -> {
+ Cache cache = getCache();
+
+ LuceneService service = LuceneServiceProvider.get(cache);
+ LuceneQuery<Integer, TestObject> query;
+ query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, queryString, defaultField);
+ LuceneQueryResults<Integer, TestObject> results = query.search();
+ assertEquals(results.size(), expectedResultsSize);
+ });
+ }
+
protected void putDataInRegion(VM vm) {
vm.invoke(() -> {
final Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
index c26997d..536f5c3 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -16,7 +16,8 @@
*/
package com.gemstone.gemfire.cache.lucene;
-import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.verifyQueryKeys;
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*;
+import static javax.swing.Action.DEFAULT;
import static org.hamcrest.Matchers.isA;
import static org.junit.Assert.assertEquals;
@@ -83,28 +84,28 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
// but standard analyzer will parse value "one@three" to be "one three"
// query will be--fields1:"one three"
// so C will be hit by query
- verifyQuery("field1:\"one three\"", "A", "C");
+ verifyQuery("field1:\"one three\"", DEFAULT_FIELD, "A", "C");
// standard analyzer will not tokenize by '_'
// this query string will be parsed as "one_three"
// query will be--field1:one_three
- verifyQuery("field1:one_three");
+ verifyQuery("field1:one_three", DEFAULT_FIELD);
// standard analyzer will tokenize by '@'
// this query string will be parsed as "one" "three"
// query will be--field1:one field1:three
- verifyQuery("field1:one@three", "A", "B", "C");
+ verifyQuery("field1:one@three", DEFAULT_FIELD, "A", "B", "C");
// keyword analyzer, this query will only match the entry that exactly matches
// this query string will be parsed as "one three"
// but keyword analyzer will parse one@three to be "one three"
// query will be--field2:one three
- verifyQuery("field2:\"one three\"", "A");
+ verifyQuery("field2:\"one three\"", DEFAULT_FIELD, "A");
// keyword analyzer without double quote. It should be the same as
// with double quote
// query will be--field2:one@three
- verifyQuery("field2:one@three", "C");
+ verifyQuery("field2:one@three", DEFAULT_FIELD, "C");
}
@Test()
@@ -130,9 +131,9 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
index.waitUntilFlushed(60000);
- verifyQuery("field1:one AND field2:two_four", "A");
- verifyQuery("field1:one AND field2:two", "A");
- verifyQuery("field1:three AND field2:four", "A");
+ verifyQuery("field1:one AND field2:two_four", DEFAULT_FIELD, "A");
+ verifyQuery("field1:one AND field2:two", DEFAULT_FIELD, "A");
+ verifyQuery("field1:three AND field2:four", DEFAULT_FIELD, "A");
}
@Test()
@@ -150,7 +151,7 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
region.put("A", new TestObject(value1, null));
index.waitUntilFlushed(60000);
- verifyQuery("field1:one", "A");
+ verifyQuery("field1:one", DEFAULT_FIELD, "A");
}
@Test()
@@ -162,7 +163,7 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
//Create a query that throws an exception
final LuceneQuery<Object, Object> query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME,
- index -> {
+ (index) -> {
throw new QueryException("Bad query");
});
@@ -178,9 +179,9 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
}
- private void verifyQuery(String query, String ... expectedKeys) throws ParseException {
+ private void verifyQuery(String query, String defaultField, String ... expectedKeys) throws ParseException {
final LuceneQuery<String, Object> queryWithStandardAnalyzer = luceneService.createLuceneQueryFactory().create(
- INDEX_NAME, REGION_NAME, query);
+ INDEX_NAME, REGION_NAME, query, defaultField);
verifyQueryKeys(queryWithStandardAnalyzer, expectedKeys);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
index 4bb67d2..6eb222d 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
@@ -18,35 +18,23 @@
*/
package com.gemstone.gemfire.cache.lucene;
-import static com.gemstone.gemfire.cache.RegionShortcut.*;
import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*;
-import static junitparams.JUnitParamsRunner.*;
import static org.junit.Assert.*;
import java.io.File;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
import com.gemstone.gemfire.cache.EvictionAction;
import com.gemstone.gemfire.cache.EvictionAlgorithm;
-import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.Type1;
-import com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities;
-import com.gemstone.gemfire.cache.lucene.test.TestObject;
import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.test.junit.categories.FlakyTest;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.test.junit.rules.DiskDirRule;
-import com.jayway.awaitility.Awaitility;
-import org.apache.lucene.queryparser.classic.ParseException;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -54,7 +42,6 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
/**
* Tests of lucene index creation that use persistence
@@ -108,7 +95,7 @@ public class LuceneQueriesPersistenceIntegrationTest extends LuceneIntegrationTe
assertNotNull(chunkRegion);
Assert.assertTrue(0 < userRegion.getDiskRegionStats().getNumOverflowOnDisk());
- LuceneQuery<Integer, Type1> query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "s:world");
+ LuceneQuery<Integer, Type1> query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "s:world", DEFAULT_FIELD);
LuceneQueryResults<Integer, Type1> results = query.search();
Assert.assertEquals(3, results.size());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
index 975b92f..1dd4aa2 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
@@ -18,6 +18,7 @@
*/
package com.gemstone.gemfire.cache.lucene.internal;
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
@@ -35,6 +36,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LuceneQueryFactoryImplJUnitTest {
+
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -48,7 +50,7 @@ public class LuceneQueryFactoryImplJUnitTest {
f.setResultLimit(25);
String[] projection = new String[] {"a", "b"};
f.setProjectionFields(projection);
- LuceneQuery<Object, Object> query = f.create("index", "region", new StringQueryProvider("test"));
+ LuceneQuery<Object, Object> query = f.create("index", "region", new StringQueryProvider("test", DEFAULT_FIELD));
assertEquals(25, query.getLimit());
assertEquals(5, query.getPageSize());
assertArrayEquals(projection, query.getProjectedFieldNames());
@@ -61,7 +63,7 @@ public class LuceneQueryFactoryImplJUnitTest {
Cache cache = mock(Cache.class);
LuceneQueryFactoryImpl f = new LuceneQueryFactoryImpl(cache);
thrown.expect(IllegalArgumentException.class);
- LuceneQuery<Object, Object> query = f.create("index", "region", new StringQueryProvider("test"));
+ LuceneQuery<Object, Object> query = f.create("index", "region", new StringQueryProvider("test", DEFAULT_FIELD));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplIntegrationTest.java
index 262efaa..c2e9b0c 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplIntegrationTest.java
@@ -19,6 +19,7 @@
package com.gemstone.gemfire.cache.lucene.internal;
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -29,8 +30,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.execute.FunctionAdapter;
@@ -68,7 +67,7 @@ public class LuceneQueryImplIntegrationTest extends LuceneIntegrationTest {
TestLuceneFunction function = new TestLuceneFunction();
FunctionService.registerFunction(function);
- StringQueryProvider provider = new StringQueryProvider();
+ StringQueryProvider provider = new StringQueryProvider(null, DEFAULT_FIELD);
LuceneQueryImpl<Object, Object> query = new LuceneQueryImpl<>("index", region, provider, null, LIMIT, 20);
LuceneQueryResults<Object, Object> results = query.search();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
index da6715a..a08875a 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -18,6 +18,7 @@
*/
package com.gemstone.gemfire.cache.lucene.internal;
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.assertEquals;
import org.apache.lucene.analysis.Analyzer;
@@ -31,7 +32,6 @@ import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import com.gemstone.gemfire.CopyHelper;
-import com.gemstone.gemfire.cache.lucene.LuceneIndex;
import com.gemstone.gemfire.cache.query.QueryException;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@@ -53,7 +53,7 @@ public class StringQueryProviderJUnitTest {
@Test
public void testQueryConstruction() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider("foo:bar");
+ StringQueryProvider provider = new StringQueryProvider("foo:bar", DEFAULT_FIELD);
Query query = provider.getQuery(mockIndex);
Assert.assertNotNull(query);
assertEquals("foo:bar", query.toString());
@@ -62,7 +62,7 @@ public class StringQueryProviderJUnitTest {
@Test
@Ignore("Custom analyzer not yet supported, this is a duplicate test right now")
public void usesCustomAnalyzer() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider("findThis");
+ StringQueryProvider provider = new StringQueryProvider("findThis", DEFAULT_FIELD);
Query query = provider.getQuery(mockIndex);
Assert.assertNotNull(query);
assertEquals("field-1:findthis field-2:findthis", query.toString());
@@ -70,15 +70,24 @@ public class StringQueryProviderJUnitTest {
@Test(expected = QueryException.class)
public void errorsOnMalformedQueryString() throws QueryException {
- StringQueryProvider provider = new StringQueryProvider("invalid:lucene:query:string");
+ StringQueryProvider provider = new StringQueryProvider("invalid:lucene:query:string", DEFAULT_FIELD);
provider.getQuery(mockIndex);
}
@Test
public void testSerialization() {
LuceneServiceImpl.registerDataSerializables();
- StringQueryProvider provider = new StringQueryProvider("text:search");
+ StringQueryProvider provider = new StringQueryProvider("text:search", DEFAULT_FIELD);
StringQueryProvider copy = CopyHelper.deepCopy(provider);
assertEquals("text:search", copy.getQueryString());
}
+
+ @Test
+ public void defaultFieldParameterShouldBeUsedByQuery() throws QueryException {
+ StringQueryProvider provider = new StringQueryProvider("findThis", "field-2");
+ Query query = provider.getQuery(mockIndex);
+ Assert.assertNotNull(query);
+ assertEquals("field-2:findthis", query.toString());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
index 39a4dde..3b0870e 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionContextJUnitTest.java
@@ -18,6 +18,7 @@
*/
package com.gemstone.gemfire.cache.lucene.internal.distributed;
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -46,7 +47,7 @@ public class LuceneFunctionContextJUnitTest {
public void testSerialization() {
LuceneServiceImpl.registerDataSerializables();
- LuceneQueryProvider provider = new StringQueryProvider("text");
+ LuceneQueryProvider provider = new StringQueryProvider("text", DEFAULT_FIELD);
CollectorManager<TopEntriesCollector> manager = new TopEntriesCollectorManager("test");
LuceneFunctionContext<TopEntriesCollector> context = new LuceneFunctionContext<>(provider, "testIndex", manager, 123);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
index c1a64ae..178fae2 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionJUnitTest.java
@@ -19,6 +19,7 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
+import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@@ -32,7 +33,6 @@ import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.execute.ResultSender;
import com.gemstone.gemfire.cache.lucene.LuceneQueryFactory;
import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider;
-import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneIndex;
import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService;
import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexImpl;
import com.gemstone.gemfire.cache.lucene.internal.StringQueryProvider;
@@ -272,7 +272,7 @@ public class LuceneFunctionJUnitTest {
mockCache = mock(InternalCache.class);
Analyzer analyzer = new StandardAnalyzer();
Mockito.doReturn(analyzer).when(mockIndex).getAnalyzer();
- queryProvider = new StringQueryProvider("gemfire:lucene");
+ queryProvider = new StringQueryProvider("gemfire:lucene", DEFAULT_FIELD);
searchArgs = new LuceneFunctionContext<IndexResultCollector>(queryProvider, "indexName");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index b7709bc..372c5a3 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -19,12 +19,10 @@
package com.gemstone.gemfire.cache.lucene.internal.distributed;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
-import java.io.IOException;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
index 15ef449..5e1a104 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
@@ -74,7 +74,7 @@ public class IndexRepositoryImplPerformanceTest {
private static int NUM_QUERIES = 500_000;
private StandardAnalyzer analyzer = new StandardAnalyzer();
-
+
@Test
public void testIndexRepository() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5dae19b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
index 0cf8953..6ef93bf 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
public class LuceneTestUtilities {
public static final String INDEX_NAME = "index";
public static final String REGION_NAME = "region";
+ public static final String DEFAULT_FIELD = "text";
public static final String CANNOT_CREATE_LUCENE_INDEX_DIFFERENT_FIELDS = "Cannot create Lucene index index on region /region with fields [field1, field2] because another member defines the same index with fields [field1].";
public static final String CANNOT_CREATE_LUCENE_INDEX_NO_ANALYZER_FIELD2 = "Cannot create Lucene index index on region /region with no analyzer on field field2 because another member defines the same index with analyzer org.apache.lucene.analysis.core.KeywordAnalyzer on that field.";
[12/33] incubator-geode git commit: GEODE-1422: Removing check to
skip enqueuing temp events
Posted by ud...@apache.org.
GEODE-1422: Removing check to skip enqueuing temp events
This check was performed outside of synchronizing on the lock, which
means that some events could be added to the temp events after the
check. This caused the test to fail due to temp events being left in the
map.
Also, fixing two race conditions in testParallelPropagationSenderStartAfterStop_Scenario2
1) It did some puts and stopped the sender without waiting for the
puts to complete. So they may not be available on the remote side
2) It started some puts asynchronously, and then started the sender
later. The puts performed before the sender started may not be present
on the remote side.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/be0f7cfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/be0f7cfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/be0f7cfb
Branch: refs/heads/feature/GEODE-420
Commit: be0f7cfb396d1f55301ad75bd5398c3d482d193d
Parents: 615e643
Author: Dan Smith <up...@apache.org>
Authored: Thu Jun 9 11:56:58 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Jun 13 10:45:14 2016 -0700
----------------------------------------------------------------------
.../asyncqueue/internal/ParallelAsyncEventQueueImpl.java | 4 +---
.../cache/wan/parallel/ParallelGatewaySenderImpl.java | 4 +---
.../parallel/ParallelGatewaySenderOperationsDUnitTest.java | 9 +++++----
3 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be0f7cfb/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
index aa3e71c..4b708b8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
@@ -112,9 +112,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
logger.info(LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
- if (!tmpQueuedEvents.isEmpty()) {
- enqueueTempEvents();
- }
+ enqueueTempEvents();
}
finally {
this.getLifeCycleLock().writeLock().unlock();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be0f7cfb/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index b313403..8f5b728 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -111,9 +111,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
logger.info(LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
- if (!tmpQueuedEvents.isEmpty()) {
- enqueueTempEvents();
- }
+ enqueueTempEvents();
}
finally {
this.getLifeCycleLock().writeLock().unlock();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be0f7cfb/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index cda5ba3..a1036f4 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -323,7 +323,11 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
LogWriterUtils.getLogWriter().info("Done few puts");
-
+
+ //Make sure the puts make it to the remote side
+ vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 200, 120000));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 200, 120000));
+
//now, stop all of the senders
stopSenders();
@@ -350,9 +354,6 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
async.join();
- vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 5000, 120000));
- vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_PR", 5000, 120000));
-
//verify all the buckets on all the sender nodes are drained
validateParallelSenderQueueAllBucketsDrained();
[21/33] incubator-geode git commit: GEODE-1545: add a test case for
querying JSON in geode-lucene
Posted by ud...@apache.org.
GEODE-1545: add a test case for querying JSON in geode-lucene
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ed32ceef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ed32ceef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ed32ceef
Branch: refs/heads/feature/GEODE-420
Commit: ed32ceefba89b5cd295659faa3368971ee4adabb
Parents: d5dae19
Author: zhouxh <gz...@pivotal.io>
Authored: Tue Jun 14 15:10:53 2016 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Tue Jun 14 15:14:39 2016 -0700
----------------------------------------------------------------------
.../lucene/LuceneQueriesIntegrationTest.java | 68 ++++++++++++++++++++
.../cache/lucene/test/LuceneTestUtilities.java | 27 ++++++++
.../gemfire/cache/lucene/test/TestObject.java | 7 ++
3 files changed, 102 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ed32ceef/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
index 536f5c3..95f5781 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -42,6 +42,8 @@ import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.execute.FunctionException;
import com.gemstone.gemfire.cache.lucene.test.TestObject;
import com.gemstone.gemfire.cache.query.QueryException;
+import com.gemstone.gemfire.pdx.JSONFormatter;
+import com.gemstone.gemfire.pdx.PdxInstance;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
@@ -96,6 +98,12 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
// query will be--field1:one field1:three
verifyQuery("field1:one@three", DEFAULT_FIELD, "A", "B", "C");
+ HashMap expectedResults = new HashMap();
+ expectedResults.put("A", new TestObject(value1, value1));
+ expectedResults.put("B", new TestObject(value2, value2));
+ expectedResults.put("C", new TestObject(value3, value3));
+ verifyQuery("field1:one@three", expectedResults);
+
// keyword analyzer, this query will only match the entry that exactly matches
// this query string will be parsed as "one three"
// but keyword analyzer will parse one@three to be "one three"
@@ -155,6 +163,29 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
}
@Test()
+ public void queryJsonObject() throws ParseException {
+ Map<String, Analyzer> fields = new HashMap<String, Analyzer>();
+ fields.put("name", null);
+ fields.put("lastName", null);
+ fields.put("address", null);
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, fields);
+ Region region = cache.createRegionFactory(RegionShortcut.PARTITION)
+ .create(REGION_NAME);
+ final LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
+
+ //Put two values with some of the same tokens
+ PdxInstance pdx1 = insertAJson(region, "jsondoc1");
+ PdxInstance pdx2 = insertAJson(region, "jsondoc2");
+ PdxInstance pdx10 = insertAJson(region, "jsondoc10");
+ index.waitUntilFlushed(60000);
+
+ HashMap expectedResults = new HashMap();
+ expectedResults.put("jsondoc1", pdx1);
+ expectedResults.put("jsondoc10", pdx10);
+ verifyQuery("name:jsondoc1*", expectedResults);
+ }
+
+ @Test()
public void throwFunctionExceptionWhenGivenBadQuery() {
LuceneService luceneService = LuceneServiceProvider.get(cache);
luceneService.createIndex(INDEX_NAME, REGION_NAME, "text");
@@ -178,6 +209,36 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
}
}
+
+ private PdxInstance insertAJson(Region region, String key) {
+ String jsonCustomer = "{"
+ + "\"name\": \""+key+"\","
+ + "\"lastName\": \"Smith\","
+ + " \"age\": 25,"
+ + "\"address\":"
+ + "{"
+ + "\"streetAddress\": \"21 2nd Street\","
+ + "\"city\": \"New York\","
+ + "\"state\": \"NY\","
+ + "\"postalCode\": \"10021\""
+ + "},"
+ + "\"phoneNumber\":"
+ + "["
+ + "{"
+ + " \"type\": \"home\","
+ + "\"number\": \"212 555-1234\""
+ + "},"
+ + "{"
+ + " \"type\": \"fax\","
+ + "\"number\": \"646 555-4567\""
+ + "}"
+ + "]"
+ + "}";
+
+ PdxInstance pdx = JSONFormatter.fromJSON(jsonCustomer);
+ region.put(key, pdx);
+ return pdx;
+ }
private void verifyQuery(String query, String defaultField, String ... expectedKeys) throws ParseException {
final LuceneQuery<String, Object> queryWithStandardAnalyzer = luceneService.createLuceneQueryFactory().create(
@@ -185,6 +246,13 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
verifyQueryKeys(queryWithStandardAnalyzer, expectedKeys);
}
+
+ private void verifyQuery(String query, HashMap expectedResults) throws ParseException {
+ final LuceneQuery<String, Object> queryWithStandardAnalyzer = luceneService.createLuceneQueryFactory().create(
+ INDEX_NAME, REGION_NAME, query);
+
+ verifyQueryKeyAndValues(queryWithStandardAnalyzer, expectedResults);
+ }
private static class MyCharacterTokenizer extends CharTokenizer {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ed32ceef/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
index 6ef93bf..d7150d9 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java
@@ -21,10 +21,12 @@ package com.gemstone.gemfire.cache.lucene.test;
import static org.junit.Assert.*;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;
+import org.apache.logging.log4j.Logger;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
@@ -38,6 +40,9 @@ import com.gemstone.gemfire.cache.lucene.LuceneServiceProvider;
import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexForPartitionedRegion;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.pdx.JSONFormatter;
+import com.gemstone.gemfire.pdx.PdxInstance;
public class LuceneTestUtilities {
public static final String INDEX_NAME = "index";
@@ -96,6 +101,28 @@ public class LuceneTestUtilities {
assertEquals(expectedKeySet, actualKeySet);
}
+ /**
+ * Verify that a query returns the expected map of key-value. Ordering is ignored.
+ */
+ public static <K> void verifyQueryKeyAndValues(LuceneQuery<K,Object> query, HashMap expectedResults) {
+ HashMap actualResults = new HashMap<>();
+ final LuceneQueryResults<K, Object> results = query.search();
+ while(results.hasNextPage()) {
+ results.getNextPage().stream()
+ .forEach(struct -> {
+ Object value = struct.getValue();
+ if (value instanceof PdxInstance) {
+ PdxInstance pdx = (PdxInstance)value;
+ String jsonString = JSONFormatter.toJSON(pdx);
+ actualResults.put(struct.getKey(), pdx);
+ } else {
+ actualResults.put(struct.getKey(), value);
+ }
+ });
+ }
+ assertEquals(expectedResults, actualResults);
+ }
+
public static void pauseSender(final Cache cache) {
final AsyncEventQueueImpl queue = (AsyncEventQueueImpl) getIndexQueue(cache);
queue.getSender().pause();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ed32ceef/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/TestObject.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/TestObject.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/TestObject.java
index a2b249e..9e984bd 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/TestObject.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/TestObject.java
@@ -49,4 +49,11 @@ public class TestObject implements Serializable {
public void setField2(final String field2) {
this.field2 = field2;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ TestObject testObject = (TestObject)obj;
+ return (testObject.field1.equals(field1) && testObject.field2.equals(field2));
+ }
+
}
[16/33] incubator-geode git commit: GEODE-1514: remove
RolePerformanceDUnitTest
Posted by ud...@apache.org.
GEODE-1514: remove RolePerformanceDUnitTest
Flaky performance test of deprecated feature
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e84e8855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e84e8855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e84e8855
Branch: refs/heads/feature/GEODE-420
Commit: e84e8855baaf2fbf5756644e7a3b94a28c9dffa1
Parents: de647cd
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 14 10:03:51 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jun 14 10:03:51 2016 -0700
----------------------------------------------------------------------
.../cache30/RolePerformanceDUnitTest.java | 192 -------------------
1 file changed, 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e84e8855/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
deleted file mode 100644
index 8a82cbe..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.cache30;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
-/**
- * Tests the performance of Regions when Roles are assigned.
- *
- * @since GemFire 5.0
- */
-@Category(DistributedTest.class)
-public class RolePerformanceDUnitTest extends JUnit4CacheTestCase {
-
- /**
- * Compares times required for series of puts with Roles assigned to
- * series of puts with no Roles assigned. Scope is D_ACK.
- * <p>
- * Up to 10 attempts will be made before failing.
- */
- @Test
- public void testRolePerformance() {
- int maxAttempts = 10;
- for (int i = 1; i <= maxAttempts; i++) {
- try {
- if (i > 1) {
- // clean up from previous run
- closeCaches();
- }
- doTestRolePerformance();
- break;
- }
- // only catch assertion failures...
- catch (AssertionError e) {
- if (i == maxAttempts) {
- throw e;
- }
- else {
- LogWriterUtils.getLogWriter().info("testRolePerformance attempt #" + i +
- " failed -- reattempting up to 10x", e);
- }
- }
- }
- }
-
- /**
- * Implementation of testRolePerformance.
- */
- private void doTestRolePerformance() {
- final String name = this.getUniqueName();
-
- // throw away this run
- createConnections(name, false);
- createRegions(name);
- executeOperations(name);
-
- closeCaches();
-
- // first time with no roles
- createConnections(name, false);
- createRegions(name);
- long millisNoRoles = executeOperations(name);
-
- closeCaches();
-
- // second time with roles
- createConnections(name, true);
- createRegions(name);
- long millisWithRoles = executeOperations(name);
-
- long deviation = (long)(millisNoRoles * 0.05); // 5% increase is allowed
- long ceiling = millisNoRoles + deviation;
-
- String data = name + " results: millisNoRoles=" + millisNoRoles +
- ", millisWithRoles=" + millisWithRoles + ", deviation=" + deviation +
- ", ceiling=" + ceiling;
- LogWriterUtils.getLogWriter().info(data);
-
- assertTrue("millisWithRoles is greater than allowable deviation: " + data,
- millisWithRoles <= ceiling);
- }
-
- /**
- * Create connection to distributed system in all vms and assign one role
- * to each if assignRoles is true.
- */
- private void createConnections(final String name, final boolean assignRoles) {
- final String[][] vmRoles = new String[][]
- {{name+"-A"},{name+"-B"},{name+"-C"},{name+"-D"}};
- for (int i = 0; i < vmRoles.length; i++) {
- final int vm = i;
- Host.getHost(0).getVM(vm).invoke(new SerializableRunnable("Connect") {
- public void run() {
- Properties config = new Properties();
- if (assignRoles) {
- config.setProperty(ROLES, vmRoles[vm][0]);
- }
- getSystem(config);
- }
- });
- }
- }
-
- /**
- * Close the cache in all vms.
- */
- private void closeCaches() {
- for (int i = 0; i < Host.getHost(0).getVMCount(); i++) {
- final int vm = i;
- Host.getHost(0).getVM(vm).invoke(new CacheSerializableRunnable("Close Cache") {
- public void run2() throws CacheException {
- closeCache();
- }
- });
- }
- }
-
- /**
- * Create the named root region in all vms.
- */
- private void createRegions(final String name) {
- for (int i = 0; i < Host.getHost(0).getVMCount(); i++) {
- final int vm = i;
- Host.getHost(0).getVM(vm).invoke(new CacheSerializableRunnable("Create Region") {
- public void run2() throws CacheException {
- AttributesFactory fac = new AttributesFactory();
- fac.setScope(Scope.DISTRIBUTED_ACK);
- fac.setDataPolicy(DataPolicy.REPLICATE);
- RegionAttributes attr = fac.create();
- createRootRegion(name, attr);
- }
- });
- }
- }
-
- /**
- * Execute operations on the named region in one vm.
- */
- private long executeOperations(final String name) {
- Host.getHost(0).getVM(0).invoke(new CacheSerializableRunnable("Operations") {
- public void run2() throws CacheException {
- Region region = getRootRegion(name);
- long begin = System.currentTimeMillis();
- for (int i = 0; i < 1000; i++) {
- region.put("KEY-"+i, "VAL-"+i);
- }
- long finish = System.currentTimeMillis();
- timing = finish - begin;
- }
- });
- Long timing = (Long) Host.getHost(0).getVM(0).invoke(() -> RolePerformanceDUnitTest.getTiming());
- return timing.longValue();
- }
- protected static transient long timing = -1;
- private static Long getTiming() {
- return new Long(timing);
- }
-
-}
-
[23/33] incubator-geode git commit: GEODE-1421: improve test to
provide more info on failure
Posted by ud...@apache.org.
GEODE-1421: improve test to provide more info on failure
I ran the test 1000 times and they all passed.
Assertions are now done on the member that does
the get that should have also stored the entry
in the cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cdfb9401
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cdfb9401
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cdfb9401
Branch: refs/heads/feature/GEODE-420
Commit: cdfb9401cff5b86ebcf8fb424bb36139bba36a91
Parents: 0d5de3e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 14 16:39:10 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jun 14 16:41:19 2016 -0700
----------------------------------------------------------------------
.../gemfire/cache/management/MemoryThresholdsDUnitTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cdfb9401/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index a91c8f5..baad698 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -1993,6 +1993,8 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
{
Integer k = new Integer(4);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
+ assertFalse(hmm.getState().isCritical());
+ assertTrue(r.containsKey(k));
}
// Place in a critical state for the next test
@@ -2004,6 +2006,8 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
{
Integer k = new Integer(5);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
+ assertTrue(hmm.getState().isCritical());
+ assertFalse(r.containsKey(k));
}
newfakeHeapUsage = Math.round(fakeHeapMaxSize * (criticalHeapThresh - 0.3f)); // below critical by 30%
@@ -2015,6 +2019,8 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
{
Integer k = new Integer(6);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
+ assertFalse(hmm.getState().isCritical());
+ assertTrue(r.containsKey(k));
}
return new Integer(expectedInvocations);
}
[10/33] incubator-geode git commit: GEODE-11: Adding stats for lucene
documents, files, and chunks
Posted by ud...@apache.org.
GEODE-11: Adding stats for lucene documents, files, and chunks
Using the new stat suppliers added with GEODE-1494 to sample useful
lucene statistics:
* Number of documents
* Number of files
* Number of chunks
* Number of bytes
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/615e643c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/615e643c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/615e643c
Branch: refs/heads/feature/GEODE-420
Commit: 615e643cf989ab709aa3880d89ad04dfffa530f0
Parents: 01848b6
Author: Dan Smith <up...@apache.org>
Authored: Wed Jun 8 14:33:15 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Jun 13 10:45:13 2016 -0700
----------------------------------------------------------------------
.../LuceneIndexForPartitionedRegion.java | 14 +++++--
.../cache/lucene/internal/LuceneIndexImpl.java | 32 ++++++++------
.../cache/lucene/internal/LuceneIndexStats.java | 24 ++++++++++-
.../internal/filesystem/FileSystemStats.java | 44 ++++++++++++++++++--
.../repository/IndexRepositoryImpl.java | 13 ++++++
.../LuceneIndexMaintenanceIntegrationTest.java | 30 +++++++++++++
.../internal/LuceneIndexStatsJUnitTest.java | 17 ++++++--
.../IndexRepositoryImplJUnitTest.java | 12 ++++++
8 files changed, 162 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 8fe5fac..d283e29 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -40,12 +40,9 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
/* wrapper of IndexWriter */
public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
- FileSystemStats fileSystemStats;
public LuceneIndexForPartitionedRegion(String indexName, String regionPath, Cache cache) {
super(indexName, regionPath, cache);
- final String statsName = indexName + "-" + regionPath;
- this.fileSystemStats = new FileSystemStats(cache.getDistributedSystem(), statsName);
}
@Override
@@ -88,6 +85,9 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
if (!chunkRegionExists(chunkRegionName)) {
chunkRegion = createChunkRegion(regionShortCut, fileRegionName, partitionAttributes, chunkRegionName);
}
+ fileSystemStats.setFileSupplier(() -> (int) getFileRegion().getLocalSize());
+ fileSystemStats.setChunkSupplier(() -> (int) getChunkRegion().getLocalSize());
+ fileSystemStats.setBytesSupplier(() -> getChunkRegion().getPrStats().getDataStoreBytesInUse());
// we will create RegionDirectories on the fly when data comes in
HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(getFieldNames());
@@ -106,6 +106,14 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
return (PartitionedRegion) cache.getRegion(regionPath);
}
+ private PartitionedRegion getFileRegion() {
+ return (PartitionedRegion) fileRegion;
+ }
+
+ private PartitionedRegion getChunkRegion() {
+ return (PartitionedRegion) chunkRegion;
+ }
+
private AsyncEventQueueFactoryImpl createAEQFactory(final Region dataRegion) {
AsyncEventQueueFactoryImpl factory = (AsyncEventQueueFactoryImpl) cache.createAsyncEventQueueFactory();
factory.setParallel(true); // parallel AEQ for PR
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
index c75148a..acd3765 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexImpl.java
@@ -46,28 +46,28 @@ import com.gemstone.gemfire.internal.logging.LogService;
public abstract class LuceneIndexImpl implements InternalLuceneIndex {
protected static final Logger logger = LogService.getLogger();
-// protected HashSet<String> searchableFieldNames = new HashSet<String>();
- String[] searchableFieldNames;
- protected RepositoryManager repositoryManager;
- protected Analyzer analyzer;
-
- Region<String, File> fileRegion;
- Region<ChunkKey, byte[]> chunkRegion;
- LuceneIndexStats indexStats;
+ protected final String indexName;
+ protected final String regionPath;
+ protected final Cache cache;
+ protected final LuceneIndexStats indexStats;
+ protected final FileSystemStats fileSystemStats;
- protected String indexName;
- protected String regionPath;
protected boolean hasInitialized = false;
protected Map<String, Analyzer> fieldAnalyzers;
+ protected String[] searchableFieldNames;
+ protected RepositoryManager repositoryManager;
+ protected Analyzer analyzer;
+ protected Region<String, File> fileRegion;
+ protected Region<ChunkKey, byte[]> chunkRegion;
+
- protected final Cache cache;
-
protected LuceneIndexImpl(String indexName, String regionPath, Cache cache) {
this.indexName = indexName;
this.regionPath = regionPath;
this.cache = cache;
final String statsName = indexName + "-" + regionPath;
this.indexStats = new LuceneIndexStats(cache.getDistributedSystem(), statsName);
+ this.fileSystemStats = new FileSystemStats(cache.getDistributedSystem(), statsName);
}
@Override
@@ -139,6 +139,14 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
this.fieldAnalyzers = fieldAnalyzers == null ? null : Collections.unmodifiableMap(fieldAnalyzers);
}
+ public LuceneIndexStats getIndexStats() {
+ return indexStats;
+ }
+
+ public FileSystemStats getFileSystemStats() {
+ return fileSystemStats;
+ }
+
protected abstract void initialize();
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java
index 8dd34a4..ea1f35e 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStats.java
@@ -20,11 +20,14 @@ package com.gemstone.gemfire.cache.lucene.internal;
import static com.gemstone.gemfire.distributed.internal.DistributionStats.getStatTime;
+import java.util.function.IntSupplier;
+
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.CopyOnWriteHashSet;
import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
public class LuceneIndexStats {
@@ -46,6 +49,7 @@ public class LuceneIndexStats {
private static final int documentsId;
private final Statistics stats;
+ private final CopyOnWriteHashSet<IntSupplier> documentsSuppliers = new CopyOnWriteHashSet<>();
static {
final StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
@@ -82,6 +86,7 @@ public class LuceneIndexStats {
public LuceneIndexStats(StatisticsFactory f, String name) {
this.stats = f.createAtomicStatistics(statsType, name);
+ stats.setIntSupplier(documentsId, this::computeDocumentCount);
}
/**
@@ -133,7 +138,22 @@ public class LuceneIndexStats {
stats.incInt(commitsId, 1);
}
- public void incDocuments(int delta) {
- stats.incInt(documentsId, delta);
+ public void addDocumentsSuppplier(IntSupplier supplier) {
+ this.documentsSuppliers.add(supplier);
+ }
+
+ public void removeDocumentsSupplier(IntSupplier supplier) {
+ this.documentsSuppliers.remove(supplier);
+ }
+
+ public int getDocuments() {
+ return this.stats.getInt(documentsId);
+ }
+
+ private int computeDocumentCount() {
+ return this.documentsSuppliers.stream()
+ .mapToInt(IntSupplier::getAsInt)
+ .sum();
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java
index 1f609fd..ee66850 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystemStats.java
@@ -18,6 +18,9 @@
*/
package com.gemstone.gemfire.cache.lucene.internal.filesystem;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+
import com.gemstone.gemfire.StatisticDescriptor;
import com.gemstone.gemfire.Statistics;
import com.gemstone.gemfire.StatisticsFactory;
@@ -38,6 +41,9 @@ public class FileSystemStats {
private static final int temporaryFileCreatesId;
private static final int fileDeletesId;
private static final int fileRenamesId;
+ private static final int filesId;
+ private static final int chunksId;
+ private static final int bytesId;
static {
final StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
@@ -47,10 +53,13 @@ public class FileSystemStats {
new StatisticDescriptor[] {
f.createLongCounter("readBytes", "Number of bytes written", "bytes"),
f.createLongCounter("writtenBytes", "Number of bytes read", "bytes"),
- f.createIntCounter("fileCreates", "Number files created", "files"),
- f.createIntCounter("temporaryFileCreates", "Number temporary files created", "files"),
- f.createIntCounter("fileDeletes", "Number files deleted", "files"),
- f.createIntCounter("fileRenames", "Number files renamed", "files"),
+ f.createIntCounter("fileCreates", "Number of files created", "files"),
+ f.createIntCounter("temporaryFileCreates", "Number of temporary files created", "files"),
+ f.createIntCounter("fileDeletes", "Number of files deleted", "files"),
+ f.createIntCounter("fileRenames", "Number of files renamed", "files"),
+ f.createIntGauge("files", "Number of files on this member", "files"),
+ f.createIntGauge("chunks", "Number of file chunks on this member", "chunks"),
+ f.createLongGauge("bytes", "Number of bytes on this member", "bytes"),
}
);
@@ -60,6 +69,9 @@ public class FileSystemStats {
temporaryFileCreatesId = statsType.nameToId("temporaryFileCreates");
fileDeletesId = statsType.nameToId("fileDeletes");
fileRenamesId = statsType.nameToId("fileRenames");
+ filesId = statsType.nameToId("files");
+ chunksId = statsType.nameToId("chunks");
+ bytesId = statsType.nameToId("bytes");
}
public FileSystemStats(StatisticsFactory f, String name) {
@@ -89,4 +101,28 @@ public class FileSystemStats {
public void incFileRenames(final int delta) {
stats.incInt(fileRenamesId,delta);
}
+
+ public void setFileSupplier(IntSupplier supplier) {
+ stats.setIntSupplier(filesId, supplier);
+ }
+
+ public int getFiles() {
+ return stats.getInt(filesId);
+ }
+
+ public void setChunkSupplier(IntSupplier supplier) {
+ stats.setIntSupplier(chunksId, supplier);
+ }
+
+ public int getChunks() {
+ return stats.getInt(chunksId);
+ }
+
+ public void setBytesSupplier(LongSupplier supplier) {
+ stats.setLongSupplier(bytesId, supplier);
+ }
+
+ public long getBytes() {
+ return stats.getLong(bytesId);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
index 88631b8..110f85a 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
@@ -32,6 +32,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import java.io.IOException;
+import java.util.function.IntSupplier;
/**
* A repository that writes to a single lucene index writer
@@ -56,6 +57,7 @@ public class IndexRepositoryImpl implements IndexRepository {
searcherManager = new SearcherManager(writer, APPLY_ALL_DELETES, true, null);
this.serializer = serializer;
this.stats = stats;
+ stats.addDocumentsSuppplier(new DocumentCountSupplier());
}
@Override
@@ -145,4 +147,15 @@ public class IndexRepositoryImpl implements IndexRepository {
public boolean isClosed() {
return region.isDestroyed();
}
+
+ private class DocumentCountSupplier implements IntSupplier {
+ @Override
+ public int getAsInt() {
+ if(isClosed()) {
+ stats.removeDocumentsSupplier(this);
+ return 0;
+ }
+ return writer.numDocs();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
index 07780ca..af8c51f 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
@@ -22,10 +22,15 @@ import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.*;
import static org.junit.Assert.*;
import java.io.Serializable;
+import java.util.concurrent.TimeUnit;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexForPartitionedRegion;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexStats;
+import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystemStats;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.jayway.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -106,6 +111,31 @@ public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest
assertEquals(3, query.search().size());
}
+ @Test
+ public void statsAreUpdatedAfterACommit() throws Exception {
+ luceneService.createIndex(INDEX_NAME, REGION_NAME, "title", "description");
+
+ Region region = createRegion(REGION_NAME, RegionShortcut.PARTITION);
+ region.put("object-1", new TestObject("title 1", "hello world"));
+ region.put("object-2", new TestObject("title 2", "this will not match"));
+ region.put("object-3", new TestObject("title 3", "hello world"));
+ region.put("object-4", new TestObject("hello world", "hello world"));
+
+ LuceneIndexForPartitionedRegion index = (LuceneIndexForPartitionedRegion) luceneService.getIndex(INDEX_NAME, REGION_NAME);
+ index.waitUntilFlushed(WAIT_FOR_FLUSH_TIME);
+
+ FileSystemStats fileSystemStats = index.getFileSystemStats();
+ LuceneIndexStats indexStats = index.getIndexStats();
+ await(() -> assertEquals(4, indexStats.getDocuments()));
+ await(() -> assertTrue(fileSystemStats.getFiles() > 0));
+ await(() -> assertTrue(fileSystemStats.getChunks() > 0));
+ await(() -> assertTrue(fileSystemStats.getBytes() > 0));
+ }
+
+ private void await(Runnable runnable) {
+ Awaitility.await().atMost(30, TimeUnit.SECONDS).until(runnable);
+ }
+
private static class TestObject implements Serializable {
String title;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStatsJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
index 3e6d44c..05e64af 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
@@ -18,11 +18,16 @@
*/
package com.gemstone.gemfire.cache.lucene.internal;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
+import java.util.function.IntSupplier;
+
import com.gemstone.gemfire.Statistics;
import com.gemstone.gemfire.StatisticsFactory;
import com.gemstone.gemfire.StatisticsType;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystemJUnitTest;
+import com.gemstone.gemfire.management.internal.cli.parser.Argument;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
import org.junit.Before;
@@ -88,9 +93,15 @@ public class LuceneIndexStatsJUnitTest {
}
@Test
- public void shouldIncrementDocumentStat() {
- stats.incDocuments(5);
- verifyIncInt("documents", 5);
+ public void shouldPollSuppliersForDocumentStat() {
+ stats.addDocumentsSuppplier(() -> 5);
+ stats.addDocumentsSuppplier(() -> 3);
+
+ int documentsId = type.nameToId("documents");
+ ArgumentCaptor<IntSupplier> documentsSupplierCaptor = ArgumentCaptor.forClass(IntSupplier.class);
+ verify(statistics).setIntSupplier(eq(documentsId), documentsSupplierCaptor.capture());
+ IntSupplier documentsSuppler = documentsSupplierCaptor.getValue();
+ assertEquals(8, documentsSuppler.getAsInt());
}
private void verifyIncInt(final String statName, final int value) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/615e643c/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index 6004623..7d3caf8 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.IntSupplier;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.index.IndexWriter;
@@ -38,6 +39,7 @@ import org.apache.lucene.queryparser.classic.QueryParser;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import com.gemstone.gemfire.cache.Region;
@@ -153,6 +155,16 @@ public class IndexRepositoryImplJUnitTest {
verify(stats, times(1)).endQuery(anyLong(), eq(2));
}
+ @Test
+ public void addingDocumentsShouldUpdateDocumentsStat() throws IOException {
+ repo.create("key1", new Type2("bar", 1, 2L, 3.0, 4.0f, "Grape Ape doughnut"));
+ repo.commit();
+ ArgumentCaptor<IntSupplier> captor = ArgumentCaptor.forClass(IntSupplier.class);
+ verify(stats).addDocumentsSuppplier(captor.capture());
+ IntSupplier supplier = captor.getValue();
+ assertEquals(1, supplier.getAsInt());
+ }
+
private void updateAndRemove(Object key1, Object key2, Object key3,
Object key4) throws IOException, ParseException {
repo.create(key1, new Type2("bacon maple bar", 1, 2L, 3.0, 4.0f, "Grape Ape doughnut"));
[14/33] incubator-geode git commit: GEODE-1517: fix TXStateProxyImpl
continue working after TXManagerImpl is closed.
Posted by ud...@apache.org.
GEODE-1517: fix TXStateProxyImpl continue working after TXManagerImpl is closed.
Holding the ReentrantLock during TXManagerImpl.close() when closing TXStateProxyImpl. Provent any TXStateProxyImpl to work further. Add a test case where it fails without the above fix and passes after the fix.
Also avoid going through synchronized failover map to check if a TXStateProxyImpl is finished, instead, use its isInProgress() call.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6f70cd70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6f70cd70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6f70cd70
Branch: refs/heads/feature/GEODE-420
Commit: 6f70cd703139417388fbd9845dd8aefb3b3f7c30
Parents: d07c966
Author: eshu <es...@pivotal.io>
Authored: Mon Jun 13 16:44:55 2016 -0700
Committer: eshu <es...@pivotal.io>
Committed: Mon Jun 13 16:44:55 2016 -0700
----------------------------------------------------------------------
.../internal/cache/RemoteOperationMessage.java | 10 ++-
.../gemfire/internal/cache/TXManagerImpl.java | 32 ++++-----
.../cache/partitioned/PartitionMessage.java | 10 ++-
.../cache/RemoteOperationMessageTest.java | 31 +++++++--
.../internal/cache/TXManagerImplTest.java | 73 +++++++++++++++-----
.../cache/partitioned/PartitionMessageTest.java | 27 ++++++--
6 files changed, 120 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f70cd70/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
index 19e1dea..db5bcca 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
@@ -241,8 +241,10 @@ public abstract class RemoteOperationMessage extends DistributionMessage impleme
sendReply = operateOnRegion(dm, r, startTime);
} else {
try {
- TXId txid = new TXId(getMemberToMasqueradeAs(), getTXUniqId());
- if (!hasTxAlreadyFinished(tx, txMgr, txid)) {
+ if (txMgr.isClosed()) {
+ // NO DISTRIBUTED MESSAGING CAN BE DONE HERE!
+ sendReply = false;
+ } else if (tx.isInProgress()) {
sendReply = operateOnRegion(dm, r, startTime);
}
} finally {
@@ -317,10 +319,6 @@ public abstract class RemoteOperationMessage extends DistributionMessage impleme
}
}
- boolean hasTxAlreadyFinished(TXStateProxy tx, TXManagerImpl txMgr, TXId txid) {
- return txMgr.hasTxAlreadyFinished(tx, txid);
- }
-
TXManagerImpl getTXManager(GemFireCacheImpl cache) {
return cache.getTxManager();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f70cd70/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
index 2608878..1ea7f71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
@@ -90,7 +90,7 @@ public class TXManagerImpl implements CacheTransactionManager,
private final ArrayList<TransactionListener> txListeners = new ArrayList<TransactionListener>(8);
public TransactionWriter writer = null;
- private boolean closed = false;
+ private volatile boolean closed = false;
private final Map<TXId, TXStateProxy> hostedTXStates;
@@ -577,7 +577,12 @@ public class TXManagerImpl implements CacheTransactionManager,
}
this.closed = true;
for (TXStateProxy proxy: this.hostedTXStates.values()) {
- proxy.close();
+ proxy.getLock().lock();
+ try {
+ proxy.close();
+ } finally {
+ proxy.getLock().unlock();
+ }
}
for (TXStateProxy proxy: this.localTxMap.values()) {
proxy.close();
@@ -646,7 +651,7 @@ public class TXManagerImpl implements CacheTransactionManager,
}
}
- private final boolean isClosed() {
+ public final boolean isClosed() {
return this.closed;
}
private final void checkClosed() {
@@ -752,10 +757,13 @@ public class TXManagerImpl implements CacheTransactionManager,
// Inflight op could be received later than TXFailover operation.
if (curVal == null) {
if (!isHostedTxRecentlyCompleted(key)) {
- this.hostedTXStates.put(key, val);
// Failover op removed the val
// It is possible that the same operation can be executed
// twice by two threads, but data is consistent.
+ this.hostedTXStates.put(key, val);
+ } else {
+ //Another thread should complete the transaction
+ logger.info("{} has already finished." , val.getTxId());
}
} else {
if (val != curVal) {
@@ -770,22 +778,6 @@ public class TXManagerImpl implements CacheTransactionManager,
return true;
}
- public boolean hasTxAlreadyFinished(TXStateProxy tx, TXId txid) {
- if (tx == null) {
- return false;
- }
- if (isHostedTxRecentlyCompleted(txid)) {
- //Should only happen when handling a later arrival of transactional op from proxy,
- //while the transaction has failed over and already committed or rolled back.
- //Just send back reply as a success op.
- //The client connection should be lost from proxy, or
- //the proxy is closed for failover to occur.
- logger.info("TxId {} has already finished." , txid);
- return true;
- }
- return false;
- }
-
/**
* Associate the remote txState with the thread processing this message. Also,
* we acquire a lock on the txState, on which this thread operates.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f70cd70/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
index 1b83ee3..14fce08 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
@@ -278,10 +278,6 @@ public abstract class PartitionMessage extends DistributionMessage implements
return (ds == null || ds.isDisconnecting());
}
- boolean hasTxAlreadyFinished(TXStateProxy tx, TXManagerImpl txMgr, TXId txid) {
- return txMgr.hasTxAlreadyFinished(tx, txid);
- }
-
PartitionedRegion getPartitionedRegion() throws PRLocallyDestroyedException {
return PartitionedRegion.getPRFromId(this.regionId);
}
@@ -343,8 +339,10 @@ public abstract class PartitionMessage extends DistributionMessage implements
sendReply = operateOnPartitionedRegion(dm, pr, startTime);
} else {
try {
- TXId txid = new TXId(getMemberToMasqueradeAs(), getTXUniqId());
- if (!hasTxAlreadyFinished(tx, txMgr, txid)) {
+ if (txMgr.isClosed()) {
+ // NO DISTRIBUTED MESSAGING CAN BE DONE HERE!
+ sendReply = false;
+ } else if (tx.isInProgress()) {
sendReply = operateOnPartitionedRegion(dm, pr, startTime);
}
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f70cd70/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessageTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessageTest.java
index ecfc2b0..18ce2a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessageTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessageTest.java
@@ -25,7 +25,6 @@ import org.mockito.internal.stubbing.answers.CallsRealMethods;
import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.TXId;
import com.gemstone.gemfire.internal.cache.TXManagerImpl;
import com.gemstone.gemfire.internal.cache.TXStateProxy;
import com.gemstone.gemfire.internal.cache.TXStateProxyImpl;
@@ -40,7 +39,6 @@ public class RemoteOperationMessageTest {
private DistributionManager dm;
private LocalRegion r;
private TXManagerImpl txMgr;
- private TXId txid;
private long startTime = 0;
TXStateProxy tx;
@@ -51,7 +49,6 @@ public class RemoteOperationMessageTest {
msg = mock(RemoteOperationMessage.class);
r = mock(LocalRegion.class);
txMgr = mock(TXManagerImpl.class);
- txid = new TXId(null, 0);
tx = mock(TXStateProxyImpl.class);
when(msg.checkCacheClosing(dm)).thenReturn(false);
@@ -59,9 +56,8 @@ public class RemoteOperationMessageTest {
when(msg.getCache(dm)).thenReturn(cache);
when(msg.getRegionByPath(cache)).thenReturn(r);
when(msg.getTXManager(cache)).thenReturn(txMgr);
- when(txMgr.hasTxAlreadyFinished(tx, txid)).thenCallRealMethod();
- doAnswer(new CallsRealMethods()).when(msg).process(dm);
+ doAnswer(new CallsRealMethods()).when(msg).process(dm);
}
@Test
@@ -75,7 +71,7 @@ public class RemoteOperationMessageTest {
@Test
public void messageForNotFinishedTXPerformsOnRegion() throws InterruptedException, RemoteOperationException {
when(txMgr.masqueradeAs(msg)).thenReturn(tx);
- when(msg.hasTxAlreadyFinished(tx, txMgr, txid)).thenCallRealMethod();
+ when(tx.isInProgress()).thenReturn(true);
msg.process(dm);
verify(msg, times(1)).operateOnRegion(dm, r, startTime);
@@ -84,10 +80,31 @@ public class RemoteOperationMessageTest {
@Test
public void messageForFinishedTXDoesNotPerformOnRegion() throws InterruptedException, RemoteOperationException {
when(txMgr.masqueradeAs(msg)).thenReturn(tx);
- when(msg.hasTxAlreadyFinished(tx, txMgr, txid)).thenReturn(true);
+ when(tx.isInProgress()).thenReturn(false);
msg.process(dm);
verify(msg, times(0)).operateOnRegion(dm, r, startTime);
}
+ @Test
+ public void noNewTxProcessingAfterTXManagerImplClosed() throws RemoteOperationException {
+ txMgr = new TXManagerImpl(null, cache);
+
+ when(msg.checkCacheClosing(dm)).thenReturn(false);
+ when(msg.checkDSClosing(dm)).thenReturn(false);
+ when(msg.getCache(dm)).thenReturn(cache);
+ when(msg.getRegionByPath(cache)).thenReturn(r);
+ when(msg.getTXManager(cache)).thenReturn(txMgr);
+
+ when(msg.canParticipateInTransaction()).thenReturn(true);
+ when(msg.canStartRemoteTransaction()).thenReturn(true);
+
+ msg.process(dm);
+
+ txMgr.close();
+
+ msg.process(dm);
+
+ verify(msg, times(1)).operateOnRegion(dm, r, startTime);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f70cd70/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
index ce24947..ae4f378 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplTest.java
@@ -49,6 +49,7 @@ public class TXManagerImplTest {
TXStateProxy tx1, tx2;
DistributionManager dm;
TXRemoteRollbackMessage rollbackMsg;
+ TXRemoteCommitMessage commitMsg;
@Before
public void setUp() {
@@ -63,9 +64,11 @@ public class TXManagerImplTest {
notCompletedTxid = new TXId(member, 2);
latch = new CountDownLatch(1);
rollbackMsg = new TXRemoteRollbackMessage();
+ commitMsg = new TXRemoteCommitMessage();
when(this.msg.canStartRemoteTransaction()).thenReturn(true);
when(this.msg.canParticipateInTransaction()).thenReturn(true);
+
}
@Test
@@ -142,9 +145,9 @@ public class TXManagerImplTest {
assertFalse(txMgr.getLock(tx, txid));
}
-
+
@Test
- public void getLockAfterTXStateCommitted() throws InterruptedException{
+ public void getLockAfterTXStateCommitted() throws InterruptedException{
TXStateProxy oldtx = txMgr.getOrSetHostedTXState(txid, msg);
assertEquals(oldtx, txMgr.getHostedTXState(txid));
@@ -157,6 +160,20 @@ public class TXManagerImplTest {
Thread t1 = new Thread(new Runnable() {
public void run() {
+ when(msg.getTXOriginatorClient()).thenReturn(mock(InternalDistributedMember.class));
+ TXStateProxy tx;
+ try {
+ tx = txMgr.masqueradeAs(commitMsg);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ tx.setCommitOnBehalfOfRemoteStub(true);
+ try {
+ tx.commit();
+ } finally {
+ txMgr.unmasquerade(tx);
+ }
txMgr.removeHostedTXState(txid);
txMgr.saveTXCommitMessageForClientFailover(txid, txCommitMsg);
}
@@ -168,11 +185,12 @@ public class TXManagerImplTest {
TXStateProxy curTx = txMgr.getHostedTXState(txid);
assertNull(curTx);
+ assertFalse(tx.isInProgress());
//after TXStateProxy committed, getLock will get the lock for the oldtx
//but caller should not perform ops on this TXStateProxy
assertTrue(txMgr.getLock(tx, txid));
}
-
+
@Test
public void masqueradeAsCanGetLock() throws InterruptedException{
TXStateProxy tx;
@@ -222,21 +240,43 @@ public class TXManagerImplTest {
}
@Test
- public void hasTxAlreadyFinishedDetectsNoTx() {
- assertFalse(txMgr.hasTxAlreadyFinished(null, txid));
+ public void testTxStateWithNotFinishedTx() {
+ TXStateProxy tx = txMgr.getOrSetHostedTXState(notCompletedTxid, msg);
+ assertTrue(tx.isInProgress());
}
-
+
@Test
- public void hasTxAlreadyFinishedDetectsTxNotFinished() {
- TXStateProxy tx = txMgr.getOrSetHostedTXState(notCompletedTxid, msg);
- assertFalse(txMgr.hasTxAlreadyFinished(tx, notCompletedTxid));
+ public void testTxStateWithCommittedTx() throws InterruptedException {
+ when(msg.getTXOriginatorClient()).thenReturn(mock(InternalDistributedMember.class));
+ setupTx();
+
+ TXStateProxy tx = txMgr.masqueradeAs(commitMsg);
+ try {
+ tx.commit();
+ } finally {
+ txMgr.unmasquerade(tx);
+ }
+ assertFalse(tx.isInProgress());
}
@Test
- public void hasTxAlreadyFinishedDetectsTxFinished() throws InterruptedException {
- TXStateProxy tx = txMgr.getOrSetHostedTXState(completedTxid, msg);
- txMgr.saveTXCommitMessageForClientFailover(completedTxid, txCommitMsg);
- assertTrue(txMgr.hasTxAlreadyFinished(tx, completedTxid));
+ public void testTxStateWithRolledBackTx() throws InterruptedException {
+ when(msg.getTXOriginatorClient()).thenReturn(mock(InternalDistributedMember.class));
+ setupTx();
+
+ TXStateProxy tx = txMgr.masqueradeAs(rollbackMsg);
+ try {
+ tx.rollback();
+ } finally {
+ txMgr.unmasquerade(tx);
+ }
+ assertFalse(tx.isInProgress());
+ }
+
+ private void setupTx() throws InterruptedException {
+ TXStateProxy tx = txMgr.masqueradeAs(msg);
+ tx.setCommitOnBehalfOfRemoteStub(true);
+ txMgr.unmasquerade(tx);
}
@Test
@@ -251,11 +291,8 @@ public class TXManagerImplTest {
e.printStackTrace();
throw new RuntimeException(e);
}
- try {
- msg.process(dm);
- } finally {
- txMgr.unmasquerade(tx1);
- }
+
+ msg.process(dm);
TXStateProxy existingTx = masqueradeToRollback();
latch.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6f70cd70/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessageTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessageTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessageTest.java
index bbbf714..e05e130 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessageTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessageTest.java
@@ -31,7 +31,6 @@ import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.internal.cache.DataLocationException;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.TXId;
import com.gemstone.gemfire.internal.cache.TXManagerImpl;
import com.gemstone.gemfire.internal.cache.TXStateProxy;
import com.gemstone.gemfire.internal.cache.TXStateProxyImpl;
@@ -47,7 +46,6 @@ public class PartitionMessageTest {
private DistributionManager dm;
private PartitionedRegion pr;
private TXManagerImpl txMgr;
- private TXId txid;
private long startTime = 1;
TXStateProxy tx;
@@ -59,7 +57,6 @@ public class PartitionMessageTest {
pr = mock(PartitionedRegion.class);
txMgr = mock(TXManagerImpl.class);
tx = mock(TXStateProxyImpl.class);
- txid = new TXId(null, 0);
when(msg.checkCacheClosing(dm)).thenReturn(false);
when(msg.checkDSClosing(dm)).thenReturn(false);
@@ -67,9 +64,8 @@ public class PartitionMessageTest {
when(msg.getGemFireCacheImpl()).thenReturn(cache);
when(msg.getStartPartitionMessageProcessingTime(pr)).thenReturn(startTime);
when(msg.getTXManagerImpl(cache)).thenReturn(txMgr);
- when(msg.hasTxAlreadyFinished(null, txMgr, txid)).thenCallRealMethod();
- doAnswer(new CallsRealMethods()).when(msg).process(dm);
+ doAnswer(new CallsRealMethods()).when(msg).process(dm);
}
@Test
@@ -83,6 +79,7 @@ public class PartitionMessageTest {
@Test
public void messageForNotFinishedTXPerformsOnRegion() throws InterruptedException, CacheException, QueryException, DataLocationException, IOException {
when(txMgr.masqueradeAs(msg)).thenReturn(tx);
+ when(tx.isInProgress()).thenReturn(true);
msg.process(dm);
verify(msg, times(1)).operateOnPartitionedRegion(dm, pr, startTime);
@@ -91,10 +88,28 @@ public class PartitionMessageTest {
@Test
public void messageForFinishedTXDoesNotPerformOnRegion() throws InterruptedException, CacheException, QueryException, DataLocationException, IOException {
when(txMgr.masqueradeAs(msg)).thenReturn(tx);
- when(msg.hasTxAlreadyFinished(tx, txMgr, txid)).thenReturn(true);
+ when(tx.isInProgress()).thenReturn(false);
msg.process(dm);
verify(msg, times(0)).operateOnPartitionedRegion(dm, pr, startTime);
}
+ @Test
+ public void noNewTxProcessingAfterTXManagerImplClosed() throws CacheException, QueryException, DataLocationException, InterruptedException, IOException {
+ txMgr = new TXManagerImpl(null, cache);
+ when(msg.getPartitionedRegion()).thenReturn(pr);
+ when(msg.getGemFireCacheImpl()).thenReturn(cache);
+ when(msg.getStartPartitionMessageProcessingTime(pr)).thenReturn(startTime);
+ when(msg.getTXManagerImpl(cache)).thenReturn(txMgr);
+ when(msg.canParticipateInTransaction()).thenReturn(true);
+ when(msg.canStartRemoteTransaction()).thenReturn(true);
+
+ msg.process(dm);
+
+ txMgr.close();
+
+ msg.process(dm);
+
+ verify(msg, times(1)).operateOnPartitionedRegion(dm, pr, startTime);
+ }
}
[13/33] incubator-geode git commit: GEODE-1508: fix
IllegalStateException from importNewObject
Posted by ud...@apache.org.
GEODE-1508: fix IllegalStateException from importNewObject
The code in EntryEventImpl that calls importNewObject
is now careful to never call importNewObject with isSerialized false
if isUnretainedNewReferenceOk is false.
The same bug was fixed for importOldObject.
Unit tests have been added for the code in EntryEventImpl
that calls both importNewObject and importOldObject.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d07c966b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d07c966b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d07c966b
Branch: refs/heads/feature/GEODE-420
Commit: d07c966bb6e0a961963433a81d2fa49c913c552d
Parents: be0f7cf
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jun 7 16:18:33 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon Jun 13 16:11:28 2016 -0700
----------------------------------------------------------------------
.../gemfire/internal/cache/EntryEventImpl.java | 42 +--
.../internal/cache/EntryEventImplTest.java | 327 ++++++++++++++++++-
2 files changed, 331 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d07c966b/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 c4849be..f559e2a 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
@@ -1150,12 +1150,10 @@ public class EntryEventImpl
if (getCachedSerializedNewValue() != null) {
importer.importNewBytes(getCachedSerializedNewValue(), true);
return;
- } else {
- if (this.newValueBytes != null && this.newValue instanceof CachedDeserializable) {
+ } else if (this.newValueBytes != null && this.newValue instanceof CachedDeserializable) {
importer.importNewBytes(this.newValueBytes, true);
return;
}
- }
}
@Unretained(ENTRY_EVENT_NEW_VALUE)
final Object nv = getRawNewValue();
@@ -1163,22 +1161,16 @@ public class EntryEventImpl
@Unretained(ENTRY_EVENT_NEW_VALUE)
final StoredObject so = (StoredObject) nv;
final boolean isSerialized = so.isSerialized();
- if (so.hasRefCount()) {
- if (importer.isUnretainedNewReferenceOk()) {
- importer.importNewObject(nv, isSerialized);
- } else {
- if (!isSerialized || prefersSerialized) {
- byte[] bytes = so.getValueAsHeapByteArray();
- importer.importNewBytes(bytes, isSerialized);
- if (isSerialized) {
- setCachedSerializedNewValue(bytes);
- }
- } else {
- importer.importNewObject(so.getValueAsDeserializedHeapObject(), true);
- }
+ if (importer.isUnretainedNewReferenceOk()) {
+ importer.importNewObject(nv, isSerialized);
+ } else if (!isSerialized || prefersSerialized) {
+ byte[] bytes = so.getValueAsHeapByteArray();
+ importer.importNewBytes(bytes, isSerialized);
+ if (isSerialized) {
+ setCachedSerializedNewValue(bytes);
}
} else {
- importer.importNewObject(nv, isSerialized);
+ importer.importNewObject(so.getValueAsDeserializedHeapObject(), true);
}
} else if (nv instanceof byte[]) {
importer.importNewBytes((byte[])nv, false);
@@ -1248,18 +1240,12 @@ public class EntryEventImpl
if (ov instanceof StoredObject) {
final StoredObject so = (StoredObject) ov;
final boolean isSerialized = so.isSerialized();
- if (so.hasRefCount()) {
- if (importer.isUnretainedOldReferenceOk()) {
- importer.importOldObject(ov, isSerialized);
- } else {
- if (!isSerialized || prefersSerialized) {
- importer.importOldBytes(so.getValueAsHeapByteArray(), isSerialized);
- } else {
- importer.importOldObject(so.getValueAsDeserializedHeapObject(), true);
- }
- }
- } else {
+ if (importer.isUnretainedOldReferenceOk()) {
importer.importOldObject(ov, isSerialized);
+ } else if (!isSerialized || prefersSerialized) {
+ importer.importOldBytes(so.getValueAsHeapByteArray(), isSerialized);
+ } else {
+ importer.importOldObject(so.getValueAsDeserializedHeapObject(), true);
}
} else if (ov instanceof byte[]) {
importer.importOldBytes((byte[])ov, false);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d07c966b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EntryEventImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EntryEventImplTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EntryEventImplTest.java
index 800527f..265795f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EntryEventImplTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EntryEventImplTest.java
@@ -24,33 +24,33 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl.NewValueImporter;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl.OldValueImporter;
+import com.gemstone.gemfire.internal.offheap.StoredObject;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class EntryEventImplTest {
- private String expectedRegionName;
private String key;
- private String value;
- private KeyInfo keyInfo;
@Before
public void setUp() throws Exception {
- expectedRegionName = "ExpectedFullRegionPathName";
key = "key1";
- value = "value1";
- keyInfo = new KeyInfo(key, value, null);
}
@Test
public void verifyToStringOutputHasRegionName() {
// mock a region object
LocalRegion region = mock(LocalRegion.class);
+ String expectedRegionName = "ExpectedFullRegionPathName";
+ String value = "value1";
+ KeyInfo keyInfo = new KeyInfo(key, value, null);
doReturn(expectedRegionName).when(region).getFullPath();
doReturn(keyInfo).when(region).getKeyInfo(any(), any(), any());
- // create entryevent for the region
- EntryEventImpl e = createEntryEvent(region);
+ // create entry event for the region
+ EntryEventImpl e = createEntryEvent(region, value);
// The name of the region should be in the toString text
String toStringValue = e.toString();
@@ -59,15 +59,322 @@ public class EntryEventImplTest {
// verify that toString called getFullPath method of region object
verify(region, times(1)).getFullPath();
}
+
+ @Test
+ public void verifyExportNewValueWithUnserializedStoredObject() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject newValue = mock(StoredObject.class);
+ byte[] newValueBytes = new byte[]{1,2,3};
+ when(newValue.getValueAsHeapByteArray()).thenReturn(newValueBytes);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewBytes(newValueBytes, false);
+ }
+
+ @Test
+ public void verifyExportNewValueWithByteArray() {
+ LocalRegion region = mock(LocalRegion.class);
+ byte[] newValue = new byte[]{1,2,3};
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewBytes(newValue, false);
+ }
+
+ @Test
+ public void verifyExportNewValueWithStringIgnoresNewValueBytes() {
+ LocalRegion region = mock(LocalRegion.class);
+ String newValue = "newValue";
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ when(nvImporter.prefersNewSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+ byte[] newValueBytes = new byte[] {1,2};
+ e.newValueBytes = newValueBytes;
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewObject(newValue, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithByteArrayCachedDeserializable() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable newValue = mock(CachedDeserializable.class);
+ byte[] newValueBytes = new byte[] {1,2,3};
+ when(newValue.getValue()).thenReturn(newValueBytes);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewBytes(newValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithStringCachedDeserializable() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable newValue = mock(CachedDeserializable.class);
+ Object newValueObj = "newValueObj";
+ when(newValue.getValue()).thenReturn(newValueObj);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+ byte[] newValueBytes = new byte[] {1,2};
+ e.newValueBytes = newValueBytes;
+ e.setCachedSerializedNewValue(newValueBytes);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewObject(newValueObj, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithStringCachedDeserializablePrefersNewValueBytes() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable newValue = mock(CachedDeserializable.class);
+ Object newValueObj = "newValueObj";
+ when(newValue.getValue()).thenReturn(newValueObj);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ when(nvImporter.prefersNewSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+ byte[] newValueBytes = new byte[] {1,2};
+ e.newValueBytes = newValueBytes;
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewBytes(newValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithStringCachedDeserializablePrefersCachedSerializedNewValue() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable newValue = mock(CachedDeserializable.class);
+ Object newValueObj = "newValueObj";
+ when(newValue.getValue()).thenReturn(newValueObj);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ when(nvImporter.prefersNewSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+ byte[] newValueBytes = new byte[] {1,2};
+ e.setCachedSerializedNewValue(newValueBytes);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewBytes(newValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithSerializedStoredObjectAndImporterPrefersSerialized() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject newValue = mock(StoredObject.class);
+ when(newValue.isSerialized()).thenReturn(true);
+ byte[] newValueBytes = new byte[]{1,2,3};
+ when(newValue.getValueAsHeapByteArray()).thenReturn(newValueBytes);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ when(nvImporter.prefersNewSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewBytes(newValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithSerializedStoredObject() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject newValue = mock(StoredObject.class);
+ when(newValue.isSerialized()).thenReturn(true);
+ Object newValueDeserialized = "newValueDeserialized";
+ when(newValue.getValueAsDeserializedHeapObject()).thenReturn(newValueDeserialized);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewObject(newValueDeserialized, true);
+ }
+
+ @Test
+ public void verifyExportNewValueWithSerializedStoredObjectAndUnretainedNewReferenceOk() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject newValue = mock(StoredObject.class);
+ when(newValue.isSerialized()).thenReturn(true);
+ Object newValueDeserialized = "newValueDeserialized";
+ when(newValue.getValueAsDeserializedHeapObject()).thenReturn(newValueDeserialized);
+ NewValueImporter nvImporter = mock(NewValueImporter.class);
+ when(nvImporter.isUnretainedNewReferenceOk()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, newValue);
+
+ e.exportNewValue(nvImporter);
+
+ verify(nvImporter).importNewObject(newValue, true);
+ }
+
+ @Test
+ public void verifyExportOldValueWithUnserializedStoredObject() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject oldValue = mock(StoredObject.class);
+ byte[] oldValueBytes = new byte[]{1,2,3};
+ when(oldValue.getValueAsHeapByteArray()).thenReturn(oldValueBytes);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldBytes(oldValueBytes, false);
+ }
+
+ @Test
+ public void verifyExportOldValueWithByteArray() {
+ LocalRegion region = mock(LocalRegion.class);
+ byte[] oldValue = new byte[]{1,2,3};
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldBytes(oldValue, false);
+ }
+
+ @Test
+ public void verifyExportOldValueWithStringIgnoresOldValueBytes() {
+ LocalRegion region = mock(LocalRegion.class);
+ String oldValue = "oldValue";
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ when(ovImporter.prefersOldSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, null);
+ byte[] oldValueBytes = new byte[]{1,2,3};
+ e.setSerializedOldValue(oldValueBytes);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldObject(oldValue, true);
+ }
+
+ @Test
+ public void verifyExportOldValuePrefersOldValueBytes() {
+ LocalRegion region = mock(LocalRegion.class);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ when(ovImporter.prefersOldSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, null);
+ byte[] oldValueBytes = new byte[]{1,2,3};
+ e.setSerializedOldValue(oldValueBytes);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldBytes(oldValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportOldValueWithCacheDeserializableByteArray() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable oldValue = mock(CachedDeserializable.class);
+ byte[] oldValueBytes = new byte[]{1,2,3};
+ when(oldValue.getValue()).thenReturn(oldValueBytes);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldBytes(oldValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportOldValueWithCacheDeserializableString() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable oldValue = mock(CachedDeserializable.class);
+ Object oldValueObj = "oldValueObj";
+ when(oldValue.getValue()).thenReturn(oldValueObj);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldObject(oldValueObj, true);
+ }
+
+ @Test
+ public void verifyExportOldValueWithCacheDeserializableOk() {
+ LocalRegion region = mock(LocalRegion.class);
+ CachedDeserializable oldValue = mock(CachedDeserializable.class);
+ Object oldValueObj = "oldValueObj";
+ when(oldValue.getValue()).thenReturn(oldValueObj);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ when(ovImporter.isCachedDeserializableValueOk()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldObject(oldValue, true);
+ }
+
+ @Test
+ public void verifyExportOldValueWithSerializedStoredObjectAndImporterPrefersSerialized() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject oldValue = mock(StoredObject.class);
+ when(oldValue.isSerialized()).thenReturn(true);
+ byte[] oldValueBytes = new byte[]{1,2,3};
+ when(oldValue.getValueAsHeapByteArray()).thenReturn(oldValueBytes);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ when(ovImporter.prefersOldSerialized()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldBytes(oldValueBytes, true);
+ }
+
+ @Test
+ public void verifyExportOldValueWithSerializedStoredObject() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject oldValue = mock(StoredObject.class);
+ when(oldValue.isSerialized()).thenReturn(true);
+ Object oldValueDeserialized = "newValueDeserialized";
+ when(oldValue.getValueAsDeserializedHeapObject()).thenReturn(oldValueDeserialized);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldObject(oldValueDeserialized, true);
+ }
+
+ @Test
+ public void verifyExportOewValueWithSerializedStoredObjectAndUnretainedOldReferenceOk() {
+ LocalRegion region = mock(LocalRegion.class);
+ StoredObject oldValue = mock(StoredObject.class);
+ when(oldValue.isSerialized()).thenReturn(true);
+ Object oldValueDeserialized = "oldValueDeserialized";
+ when(oldValue.getValueAsDeserializedHeapObject()).thenReturn(oldValueDeserialized);
+ OldValueImporter ovImporter = mock(OldValueImporter.class);
+ when(ovImporter.isUnretainedOldReferenceOk()).thenReturn(true);
+ EntryEventImpl e = createEntryEvent(region, null);
+ e.setOldValue(oldValue);
+
+ e.exportOldValue(ovImporter);
+
+ verify(ovImporter).importOldObject(oldValue, true);
+ }
- private EntryEventImpl createEntryEvent(LocalRegion l) {
+ private EntryEventImpl createEntryEvent(LocalRegion l, Object newValue) {
// create a dummy event id
byte[] memId = { 1,2,3 };
EventID eventId = new EventID(memId, 11, 12, 13);
// create an event
EntryEventImpl event = EntryEventImpl.create(l, Operation.CREATE, key,
- value, null, false /* origin remote */, null,
+ newValue, null, false /* origin remote */, null,
false /* generateCallbacks */,
eventId);
// avoid calling invokeCallbacks
[18/33] incubator-geode git commit: GEODE-1542 shared/unordered
tcp/ip connection times out, initiating suspicion
Posted by ud...@apache.org.
GEODE-1542 shared/unordered tcp/ip connection times out, initiating suspicion
This disables timing out of shared/unordered TcpConduit connections. We don't
want them to time out because we are using them to initiate suspect processing
on other members.
The ticket also pointed out a problem with the "final check" mechanism in
the health monitor. I tracked that down to improper use of SocketCreator
to create the server-socket in GMSHealthMonitor. It was creating sn SSL
socket if SSL is enabled but the client-side of the check uses non-SSL
sockets. I changed the server to use non-SSL sockets as well since no
useful information is sent over the final-check TCP/IP connections & they
need to be lightweight and fast.
While looking at logs I also found that the heartbeat request sent at the
beginning of a final-check had a request-ID even though it's not waiting
for a response. That causes processing of the response to do more work
than necessary so I changed it to remove the request-ID from the message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/33ceb371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/33ceb371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/33ceb371
Branch: refs/heads/feature/GEODE-420
Commit: 33ceb371554a13c7643ddaf9488ffa83963de1e7
Parents: 4afc5b1
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Jun 14 10:46:16 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Jun 14 10:47:53 2016 -0700
----------------------------------------------------------------------
.../membership/gms/fd/GMSHealthMonitor.java | 75 ++++++++++----------
.../membership/gms/membership/GMSJoinLeave.java | 8 +--
.../gms/messages/HeartbeatRequestMessage.java | 8 +++
.../gemfire/internal/SocketCreator.java | 35 +++++++--
.../gemfire/internal/tcp/Connection.java | 4 +-
5 files changed, 81 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/33ceb371/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index f27e0b8..203d9ce 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.fd;
import static com.gemstone.gemfire.internal.DataSerializableFixedID.HEARTBEAT_REQUEST;
import static com.gemstone.gemfire.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE;
import static com.gemstone.gemfire.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
+import static com.sun.corba.se.impl.naming.cosnaming.NamingUtils.debug;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -195,7 +196,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
return timeStamp;
}
- public void setTimeStamp(long timeStamp) {
+ public void setTime(long timeStamp) {
this.timeStamp = timeStamp;
}
}
@@ -289,48 +290,41 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
long uuidMSBs = in.readLong();
GMSHealthMonitor.this.stats.incFinalCheckRequestsReceived();
GMSHealthMonitor.this.stats.incTcpFinalCheckRequestsReceived();
- boolean debug = logger.isDebugEnabled();
GMSMember gmbr = (GMSMember) GMSHealthMonitor.this.localAddress.getNetMember();
UUID myUUID = gmbr.getUUID();
// during reconnect or rapid restart we will have a zero viewId but there may still
// be an old ID in the membership view that we do not want to respond to
int myVmViewId = gmbr.getVmViewId();
- if (debug) {
- if (playingDead) {
- logger.debug("simulating sick member in health check");
- } else if (vmViewId == myVmViewId
- && uuidLSBs == myUUID.getLeastSignificantBits()
- && uuidMSBs == myUUID.getMostSignificantBits()) {
- logger.debug("UUID matches my own - sending OK reply");
- } else {
- logger.debug("GMSHealthMonitor my UUID is {},{} received is {},{}. My viewID is {} received is {}",
- Long.toHexString(myUUID.getMostSignificantBits()),
- Long.toHexString(myUUID.getLeastSignificantBits()),
- Long.toHexString(uuidMSBs), Long.toHexString(uuidLSBs),
- myVmViewId, vmViewId);
- }
- }
- if (!playingDead
- && uuidLSBs == myUUID.getLeastSignificantBits()
- && uuidMSBs == myUUID.getMostSignificantBits()
- && vmViewId == myVmViewId) {
+ if (playingDead) {
+ logger.debug("HealthMonitor: simulating sick member in health check");
+ } else if (uuidLSBs == myUUID.getLeastSignificantBits()
+ && uuidMSBs == myUUID.getMostSignificantBits()
+ && vmViewId == myVmViewId) {
+ logger.debug("HealthMonitor: sending OK reply");
out.write(OK);
out.flush();
socket.shutdownOutput();
GMSHealthMonitor.this.stats.incFinalCheckResponsesSent();
GMSHealthMonitor.this.stats.incTcpFinalCheckResponsesSent();
if (debug) {
- logger.debug("GMSHealthMonitor server socket replied OK.");
+ logger.debug("HealthMonitor: server replied OK.");
+ }
+ } else {
+ if (logger.isDebugEnabled()) {
+ logger.debug("HealthMonitor: sending ERROR reply - my UUID is {},{} received is {},{}. My viewID is {} received is {}",
+ Long.toHexString(myUUID.getMostSignificantBits()),
+ Long.toHexString(myUUID.getLeastSignificantBits()),
+ Long.toHexString(uuidMSBs),
+ Long.toHexString(uuidLSBs),
+ myVmViewId, vmViewId);
}
- }
- else {
out.write(ERROR);
out.flush();
socket.shutdownOutput();
GMSHealthMonitor.this.stats.incFinalCheckResponsesSent();
GMSHealthMonitor.this.stats.incTcpFinalCheckResponsesSent();
if (debug) {
- logger.debug("GMSHealthMonitor server socket replied ERROR.");
+ logger.debug("HealthMonitor: server replied ERROR.");
}
}
} catch (IOException e) {
@@ -376,8 +370,8 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
private void contactedBy(InternalDistributedMember sender, long timeStamp) {
TimeStamp cTS = new TimeStamp(timeStamp);
cTS = memberTimeStamps.putIfAbsent(sender, cTS);
- if (cTS != null) {
- cTS.setTimeStamp(timeStamp);
+ if (cTS != null && cTS.getTime() < timeStamp) {
+ cTS.setTime(timeStamp);
}
if (suspectedMemberInView.remove(sender) != null) {
logger.info("No longer suspecting {}", sender);
@@ -405,8 +399,6 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
@Override
public void run() {
- // TODO GemFire used the tcp/ip connection but this is using heartbeats
-
boolean pinged = false;
try {
pinged = GMSHealthMonitor.this.doCheckMember(mbr, true);
@@ -455,9 +447,12 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
long startTime = System.currentTimeMillis();
logger.trace("Checking member {}", member);
final HeartbeatRequestMessage hrm = constructHeartbeatRequestMessage(member);
- final Response pingResp = new Response();
- if(waitForResponse) {
+ Response pingResp = null;
+ if (waitForResponse) {
+ pingResp = new Response();
requestIdVsResponse.put(hrm.getRequestId(), pingResp);
+ } else {
+ hrm.clearRequestId();
}
try {
Set<InternalDistributedMember> membersNotReceivedMsg = this.services.getMessenger().send(hrm);
@@ -484,7 +479,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
logger.trace("received heartbeat from {}", member);
this.stats.incHeartbeatsReceived();
if (ts != null) {
- ts.setTimeStamp(System.currentTimeMillis());
+ ts.setTime(System.currentTimeMillis());
}
return true;
}
@@ -547,12 +542,13 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
DataOutputStream out = new DataOutputStream(clientSocket.getOutputStream());
GMSMember gmbr = (GMSMember) suspectMember.getNetMember();
writeMemberToStream(gmbr, out);
- clientSocket.shutdownOutput();
this.stats.incFinalCheckRequestsSent();
this.stats.incTcpFinalCheckRequestsSent();
- logger.debug("Connected - reading response from suspect member {}", suspectMember);
+ logger.debug("Connected to suspect member - reading response");
int b = in.read();
- logger.debug("Received {}", (b == OK ? "OK" : (b == ERROR ? "ERROR" : b)), suspectMember);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received {}", (b == OK ? "OK" : (b == ERROR ? "ERROR" : "unknown response: " + b)));
+ }
if (b >= 0) {
this.stats.incFinalCheckResponsesReceived();
this.stats.incTcpFinalCheckResponsesReceived();
@@ -560,7 +556,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
if (b == OK) {
TimeStamp ts = memberTimeStamps.get(suspectMember);
if (ts != null) {
- ts.setTimeStamp(System.currentTimeMillis());
+ ts.setTime(System.currentTimeMillis());
}
return true;
} else {
@@ -659,7 +655,8 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
ServerSocket createServerSocket(InetAddress socketAddress, int[] portRange) {
ServerSocket serverSocket = null;
try {
- serverSocket = SocketCreator.getDefaultInstance().createServerSocketUsingPortRange(socketAddress, 50/*backlog*/, true/*isBindAddress*/, false/*useNIO*/, 65536/*tcpBufferSize*/, portRange);
+ serverSocket = SocketCreator.getDefaultInstance().createServerSocketUsingPortRange(socketAddress, 50/*backlog*/,
+ true/*isBindAddress*/, false/*useNIO*/, 65536/*tcpBufferSize*/, portRange, false);
socketPort = serverSocket.getLocalPort();
} catch (IOException e) {
throw new GemFireConfigException("Unable to allocate a failure detection port in the membership-port range", e);
@@ -1285,8 +1282,8 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
//this will just send heartbeat request, it will not wait for response
//if we will get heartbeat then it will change the timestamp, which we are
//checking below in case of tcp check failure..
- GMSHealthMonitor.this.doCheckMember(mbr, false);
- pinged = GMSHealthMonitor.this.doTCPCheckMember(mbr, port);
+ doCheckMember(mbr, false);
+ pinged = doTCPCheckMember(mbr, port);
}
if (!pinged && !isStopping) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/33ceb371/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 8dce1a5..87fac53 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
@@ -533,7 +533,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
if (!isCoordinator && !isStopping && !services.getCancelCriterion().isCancelInProgress()) {
- logger.debug("JoinLeave is checking to see if I should become coordinator");
+ logger.debug("Checking to see if I should become coordinator");
NetView check = new NetView(v, v.getViewId() + 1);
check.remove(incomingRequest.getMemberID());
synchronized (removedMembers) {
@@ -600,7 +600,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
if (!isCoordinator && !isStopping && !services.getCancelCriterion().isCancelInProgress()) {
- logger.debug("JoinLeave is checking to see if I should become coordinator");
+ logger.debug("Checking to see if I should become coordinator");
NetView check = new NetView(v, v.getViewId() + 1);
synchronized (removedMembers) {
removedMembers.add(mbr);
@@ -630,7 +630,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
}
private void recordViewRequest(DistributionMessage request) {
- logger.debug("JoinLeave is recording the request to be processed in the next membership view");
+ logger.debug("Recording the request to be processed in the next membership view");
synchronized (viewRequests) {
viewRequests.add(request);
viewRequests.notifyAll();
@@ -1441,7 +1441,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
if (view != null) {
if (view.size() > 1) {
List<InternalDistributedMember> coords = view.getPreferredCoordinators(Collections.<InternalDistributedMember>emptySet(), localAddress, 5);
- logger.debug("JoinLeave sending a leave request to {}", coords);
+ logger.debug("Sending my leave request to {}", coords);
LeaveRequestMessage m = new LeaveRequestMessage(coords, this.localAddress, "this member is shutting down");
services.getMessenger().send(m);
} // view.size
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/33ceb371/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
index 3c08e33..e0f4515 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java
@@ -41,6 +41,14 @@ public class HeartbeatRequestMessage extends HighPriorityDistributionMessage{
public InternalDistributedMember getTarget() {
return target;
}
+
+ /**
+ * If no response is desired the requestId can be reset by invoking
+ * this method
+ */
+ public void clearRequestId() {
+ requestId = -1;
+ }
@Override
public int getDSFID() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/33ceb371/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
index 367d4a7..739028c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.internal;
+import static javafx.scene.input.KeyCode.L;
+
import com.gemstone.gemfire.GemFireConfigException;
import com.gemstone.gemfire.SystemConnectException;
import com.gemstone.gemfire.SystemFailure;
@@ -765,16 +767,22 @@ public class SocketCreator {
* SSL configuration is left up to JSSE properties in java.security file.
*/
public ServerSocket createServerSocket( int nport, int backlog, InetAddress bindAddr ) throws IOException {
- return createServerSocket( nport, backlog, bindAddr, -1 );
+ return createServerSocket( nport, backlog, bindAddr, -1, useSSL);
}
public ServerSocket createServerSocket(int nport, int backlog,
- InetAddress bindAddr, int socketBufferSize)
+ InetAddress bindAddr, int socketBufferSize)
+ throws IOException {
+ return createServerSocket(nport, backlog, bindAddr, socketBufferSize, useSSL);
+ }
+
+ private ServerSocket createServerSocket(int nport, int backlog,
+ InetAddress bindAddr, int socketBufferSize, boolean sslConnection)
throws IOException {
// rw.readLock().lockInterruptibly();
// try {
printConfig();
- if ( this.useSSL ) {
+ if ( sslConnection ) {
if (this.sslContext == null) {
throw new GemFireConfigException("SSL not configured correctly, Please look at previous error");
}
@@ -830,7 +838,23 @@ public class SocketCreator {
public ServerSocket createServerSocketUsingPortRange(InetAddress ba, int backlog,
boolean isBindAddress, boolean useNIO, int tcpBufferSize, int[] tcpPortRange)
throws IOException {
-
+ return createServerSocketUsingPortRange(ba, backlog, isBindAddress, useNIO, tcpBufferSize, tcpPortRange, this.useSSL);
+ }
+
+ /**
+ * Creates or bind server socket to a random port selected
+ * from tcp-port-range which is same as membership-port-range.
+ * @param ba
+ * @param backlog
+ * @param isBindAddress
+ * @param tcpBufferSize
+ * @param sslConnection whether to connect using SSL
+ * @return Returns the new server socket.
+ * @throws IOException
+ */
+ public ServerSocket createServerSocketUsingPortRange(InetAddress ba, int backlog,
+ boolean isBindAddress, boolean useNIO, int tcpBufferSize, int[] tcpPortRange, boolean sslConnection)
+ throws IOException {
ServerSocket socket = null;
int localPort = 0;
int startingPort = 0;
@@ -862,7 +886,8 @@ public class SocketCreator {
InetSocketAddress addr = new InetSocketAddress(isBindAddress ? ba : null, localPort);
socket.bind(addr, backlog);
} else {
- socket = SocketCreator.getDefaultInstance().createServerSocket(localPort, backlog, isBindAddress? ba : null, tcpBufferSize);
+ socket = SocketCreator.getDefaultInstance()
+ .createServerSocket(localPort, backlog, isBindAddress? ba : null, tcpBufferSize, sslConnection);
}
break;
} catch (java.net.SocketException ex) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/33ceb371/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index 85e3511..6528877 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -569,7 +569,9 @@ public class Connection implements Runnable {
if (isSocketClosed()) {
return true;
}
- if (isSocketInUse()) {
+ if (isSocketInUse()
+ || (this.sharedResource && !this.preserveOrder)) { // shared/unordered connections are used for failure-detection
+ // and are not subject to idle-timeout
return false;
}
boolean isIdle = !this.accessed;
[22/33] incubator-geode git commit: GEODE-1545: fix compile problem
caused by merge
Posted by ud...@apache.org.
GEODE-1545: fix compile problem caused by merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0d5de3e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0d5de3e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0d5de3e3
Branch: refs/heads/feature/GEODE-420
Commit: 0d5de3e3f5e69f4de683ea289ac58d36280f7d6d
Parents: ed32cee
Author: zhouxh <gz...@pivotal.io>
Authored: Tue Jun 14 15:25:46 2016 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Tue Jun 14 15:25:46 2016 -0700
----------------------------------------------------------------------
.../gemfire/cache/lucene/LuceneQueriesIntegrationTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d5de3e3/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
index 95f5781..587e4db 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -102,7 +102,7 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
expectedResults.put("A", new TestObject(value1, value1));
expectedResults.put("B", new TestObject(value2, value2));
expectedResults.put("C", new TestObject(value3, value3));
- verifyQuery("field1:one@three", expectedResults);
+ verifyQuery("field1:one@three", DEFAULT_FIELD, expectedResults);
// keyword analyzer, this query will only match the entry that exactly matches
// this query string will be parsed as "one three"
@@ -182,7 +182,7 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
HashMap expectedResults = new HashMap();
expectedResults.put("jsondoc1", pdx1);
expectedResults.put("jsondoc10", pdx10);
- verifyQuery("name:jsondoc1*", expectedResults);
+ verifyQuery("name:jsondoc1*", DEFAULT_FIELD, expectedResults);
}
@Test()
@@ -247,9 +247,9 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
verifyQueryKeys(queryWithStandardAnalyzer, expectedKeys);
}
- private void verifyQuery(String query, HashMap expectedResults) throws ParseException {
+ private void verifyQuery(String query, String DEFAULT_FIELD, HashMap expectedResults) throws ParseException {
final LuceneQuery<String, Object> queryWithStandardAnalyzer = luceneService.createLuceneQueryFactory().create(
- INDEX_NAME, REGION_NAME, query);
+ INDEX_NAME, REGION_NAME, query, DEFAULT_FIELD);
verifyQueryKeyAndValues(queryWithStandardAnalyzer, expectedResults);
}