[geode] branch develop updated (e2905f4 -> d6c1497)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e2905f4 GEODE-7770: remove unused cache reference (#4700) add d6c1497 GEODE-7769: use parseFloat instead of valueOf (#4699) No new revisions were added by this update. Summary of changes: .../org/apache/geode/modules/session/bootstrap/AbstractCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] branch develop updated (d6c1497 -> bf3e280)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d6c1497 GEODE-7769: use parseFloat instead of valueOf (#4699) add bf3e280 GEODE-7768: remove redundant null checks (#4701) No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/modules/util/BootstrappingFunction.java | 3 +-- .../org/apache/geode/internal/admin/remote/RemoteApplicationVM.java | 2 +- .../geode/internal/admin/statalerts/DummyStatisticInfoImpl.java | 2 +- .../org/apache/geode/internal/admin/statalerts/StatisticInfoImpl.java | 2 +- .../src/main/java/org/apache/geode/internal/cache/FilterProfile.java | 2 +- .../java/org/apache/geode/internal/cache/PartitionedRegionHelper.java | 2 +- .../main/java/org/apache/geode/internal/cache/TXCommitMessage.java| 2 +- .../src/main/java/org/apache/geode/internal/cache/TXEntryState.java | 2 +- geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java | 2 +- .../org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java | 2 +- .../org/apache/geode/internal/cache/versions/RegionVersionHolder.java | 2 +- geode-core/src/main/java/org/apache/geode/pdx/internal/PdxField.java | 2 +- geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java | 2 +- .../java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java| 4 ++-- .../geode/management/internal/cli/commands/DescribeMemberCommand.java | 2 +- geode-junit/src/main/java/org/apache/geode/DeltaTestImpl.java | 2 +- .../main/java/org/apache/geode/cache/query/data/PortfolioData.java| 2 +- .../geode/distributed/internal/membership/gms/GMSMemberData.java | 2 +- 18 files changed, 19 insertions(+), 20 deletions(-)
[geode] branch develop updated (9ad6417 -> e2905f4)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 9ad6417 GEODE-7773: remove redundant addAll command (#4703) add e2905f4 GEODE-7770: remove unused cache reference (#4700) No new revisions were added by this update. Summary of changes: .../apache/geode/cache/lucene/internal/LuceneRegionListener.java| 6 +- .../org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java | 2 +- .../geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-)
[geode] branch develop updated (1befce1 -> 9ad6417)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1befce1 GEODE-7798: Fix flaky PubSub test (#4714) add 9ad6417 GEODE-7773: remove redundant addAll command (#4703) No new revisions were added by this update. Summary of changes: .../apache/geode/cache/lucene/internal/cli/LuceneListIndexCommand.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[geode-kafka-connector] branch master updated: geode-dunit dependency added and naming changes
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new 792e301 geode-dunit dependency added and naming changes 792e301 is described below commit 792e30154439c68f82274bc54763c5f13ed9078d Author: Nabarun Nag AuthorDate: Tue Feb 18 20:39:10 2020 -0800 geode-dunit dependency added and naming changes * Adding geode-dunit to run the tests. * Adding the dunit folder to the gitignore * adding the sink tests * Fixing the sink test issue * Renamed the package to org.apache * Spotless and more apache renaming. * Removed checked in --- .gitignore | 3 +- build.gradle | 5 +- .../geode/kafka/GeodeConnectorConfig.java | 2 +- .../org/{ => apache}/geode/kafka/GeodeContext.java | 8 +- .../{ => apache}/geode/kafka/LocatorHostPort.java | 2 +- .../kafka/security/SystemPropertyAuthInit.java | 2 +- .../geode/kafka/sink/BatchRecords.java | 2 +- .../geode/kafka/sink/GeodeKafkaSink.java | 9 +- .../geode/kafka/sink/GeodeKafkaSinkTask.java | 4 +- .../geode/kafka/sink/GeodeSinkConnectorConfig.java | 5 +- .../geode/kafka/source/EventBufferSupplier.java| 2 +- .../geode/kafka/source/GeodeEvent.java | 2 +- .../geode/kafka/source/GeodeKafkaSource.java | 7 +- .../kafka/source/GeodeKafkaSourceListener.java | 2 +- .../geode/kafka/source/GeodeKafkaSourceTask.java | 4 +- .../kafka/source/GeodeSourceConnectorConfig.java | 5 +- .../kafka/source/SharedEventBufferSupplier.java| 2 +- .../apache/geode/kafka/GeodeAsSinkDUnitTest.java | 163 .../apache/geode/kafka/GeodeAsSourceDUnitTest.java | 173 + .../geode/kafka/GeodeConnectorConfigTest.java | 10 +- .../kafka/security/SystemPropertyAuthInitTest.java | 28 ++ .../geode/kafka/sink/BatchRecordsTest.java | 2 +- .../geode/kafka/sink/GeodeKafkaSinkTaskTest.java | 8 +- .../geode/kafka/sink/GeodeKafkaSinkTest.java | 7 +- .../kafka/source/GeodeKafkaSourceTaskTest.java | 8 +- .../geode/kafka/source/GeodeKafkaSourceTest.java | 7 +- .../source/GeodeSourceConnectorConfigTest.java | 7 +- .../source/SharedEventBufferSupplierTest.java | 2 +- .../geode/kafka/utilities/GeodeKafkaTestUtils.java | 161 .../geode/kafka/utilities}/JavaProcess.java| 14 +- .../geode/kafka/utilities}/KafkaLocalCluster.java | 2 +- .../kafka/utilities}/WorkerAndHerderCluster.java | 9 +- .../kafka/utilities}/WorkerAndHerderWrapper.java | 35 +- .../kafka/utilities}/ZooKeeperLocalCluster.java| 3 +- .../java/org/geode/kafka/GeodeContextTest.java | 18 - .../org/geode/kafka/GeodeKafkaTestCluster.java | 413 - .../java/org/geode/kafka/GeodeLocalCluster.java| 41 -- .../org/geode/kafka/LocatorLauncherWrapper.java| 51 --- .../org/geode/kafka/ServerLauncherWrapper.java | 70 .../kafka/security/SystemPropertyAuthInitTest.java | 27 -- 40 files changed, 633 insertions(+), 692 deletions(-) diff --git a/.gitignore b/.gitignore index 74613b4..2e856f5 100644 --- a/.gitignore +++ b/.gitignore @@ -234,4 +234,5 @@ dist/ nbdist/ .nb-gradle/ -.idea/ \ No newline at end of file +.idea/ +**/dunit diff --git a/build.gradle b/build.gradle index 2b7f853..add42c7 100644 --- a/build.gradle +++ b/build.gradle @@ -73,10 +73,11 @@ dependencies { testCompile(group: 'org.apache.kafka', name: 'connect-runtime', version: '2.3.1') testCompile(group: 'junit', name: 'junit', version: '4.12') +//testCompile("org.junit.jupiter:junit-jupiter-params:5.4.2") testCompile('org.mockito:mockito-core:3.2.4') testCompile('pl.pragmatists:JUnitParams:1.1.1') - -testImplementation 'org.awaitility:awaitility:4.0.2' +testCompile(group: 'org.apache.geode', name: 'geode-dunit', version: '1.9.0') +testImplementation 'org.awaitility:awaitility:3.1.6' } shadowJar { diff --git a/src/main/java/org/geode/kafka/GeodeConnectorConfig.java b/src/main/java/org/apache/geode/kafka/GeodeConnectorConfig.java similarity index 99% rename from src/main/java/org/geode/kafka/GeodeConnectorConfig.java rename to src/main/java/org/apache/geode/kafka/GeodeConnectorConfig.java index 7fbfb55..476c07c 100644 --- a/src/main/java/org/geode/kafka/GeodeConnectorConfig.java +++ b/src/main/java/org/apache/geode/kafka/GeodeConnectorConfig.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.geode.kafka; +package org.apache.geode.kafka; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/org/geode/kaf
[geode-kafka-connector] branch feature/restructuring updated (e58f29a -> e734801)
This is an automated email from the ASF dual-hosted git repository. nnag pushed a change to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git. from e58f29a Spotless and more apache renaming. add e734801 Removed test artifacts No new revisions were added by this update. Summary of changes: ConfigDiskDir_locator1/BACKUPcluster_config.if| Bin 1048576 -> 0 bytes ConfigDiskDir_locator1/BACKUPcluster_config_1.crf | Bin 200 -> 0 bytes ConfigDiskDir_locator1/BACKUPcluster_config_1.drf | Bin 34 -> 0 bytes ConfigDiskDir_locator1/BACKUPcluster_config_1.krf | Bin 68 -> 0 bytes ConfigDiskDir_locator1/BACKUPcluster_config_3.crf | Bin 41 -> 0 bytes ConfigDiskDir_locator1/BACKUPcluster_config_3.drf | Bin 36 -> 0 bytes locator10334view.dat | Bin 299 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ConfigDiskDir_locator1/BACKUPcluster_config.if delete mode 100644 ConfigDiskDir_locator1/BACKUPcluster_config_1.crf delete mode 100644 ConfigDiskDir_locator1/BACKUPcluster_config_1.drf delete mode 100644 ConfigDiskDir_locator1/BACKUPcluster_config_1.krf delete mode 100644 ConfigDiskDir_locator1/BACKUPcluster_config_3.crf delete mode 100644 ConfigDiskDir_locator1/BACKUPcluster_config_3.drf delete mode 100644 locator10334view.dat
[geode-kafka-connector] branch feature/restructuring created (now e58f29a)
This is an automated email from the ASF dual-hosted git repository. nnag pushed a change to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git. at e58f29a Spotless and more apache renaming. This branch includes the following new commits: new 035d794 Adding geode-dunit to run the tests. new 2011c92 Adding the dunit folder to the gitignore new 3e12e9e adding the sink tests new 03ff785 Fixing the sink test issue new 7f72e65 Renamed the package to org.apache new e58f29a Spotless and more apache renaming. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode-kafka-connector] 05/06: Renamed the package to org.apache
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git commit 7f72e657fcb36f1b104c98b3f381f84ecb60a953 Author: Naburun Nag AuthorDate: Tue Feb 18 20:07:28 2020 -0800 Renamed the package to org.apache --- .../geode/kafka/GeodeConnectorConfig.java | 2 +- .../org/{ => apache}/geode/kafka/GeodeContext.java | 2 +- .../{ => apache}/geode/kafka/LocatorHostPort.java | 2 +- .../kafka/security/SystemPropertyAuthInit.java | 2 +- .../geode/kafka/sink/BatchRecords.java | 2 +- .../geode/kafka/sink/GeodeKafkaSink.java | 8 +- .../geode/kafka/sink/GeodeKafkaSinkTask.java | 4 +- .../geode/kafka/sink/GeodeSinkConnectorConfig.java | 4 +- .../geode/kafka/source/EventBufferSupplier.java| 2 +- .../geode/kafka/source/GeodeEvent.java | 2 +- .../geode/kafka/source/GeodeKafkaSource.java | 6 +- .../kafka/source/GeodeKafkaSourceListener.java | 2 +- .../geode/kafka/source/GeodeKafkaSourceTask.java | 4 +- .../kafka/source/GeodeSourceConnectorConfig.java | 4 +- .../kafka/source/SharedEventBufferSupplier.java| 2 +- .../geode/kafka/GeodeAsSinkDUnitTest.java | 20 +- .../geode/kafka/GeodeAsSourceDUnitTest.java| 25 +- .../geode/kafka/GeodeConnectorConfigTest.java | 10 +- .../geode/kafka/sink/BatchRecordsTest.java | 2 +- .../geode/kafka/sink/GeodeKafkaSinkTaskTest.java | 4 +- .../geode/kafka/sink/GeodeKafkaSinkTest.java | 6 +- .../kafka/source/GeodeKafkaSourceTaskTest.java | 8 +- .../geode/kafka/source/GeodeKafkaSourceTest.java | 6 +- .../source/GeodeSourceConnectorConfigTest.java | 6 +- .../source/SharedEventBufferSupplierTest.java | 2 +- .../kafka/utilities}/GeodeKafkaTestUtils.java | 28 +- .../geode/kafka/utilities}/JavaProcess.java| 2 +- .../geode/kafka/utilities}/KafkaLocalCluster.java | 2 +- .../kafka/utilities}/WorkerAndHerderCluster.java | 2 +- .../kafka/utilities}/WorkerAndHerderWrapper.java | 41 +- .../kafka/utilities}/ZooKeeperLocalCluster.java| 2 +- .../java/org/geode/kafka/GeodeContextTest.java | 18 - .../org/geode/kafka/GeodeKafkaTestCluster.java | 412 - .../java/org/geode/kafka/GeodeLocalCluster.java| 41 -- .../org/geode/kafka/LocatorLauncherWrapper.java| 50 --- .../org/geode/kafka/ServerLauncherWrapper.java | 70 36 files changed, 108 insertions(+), 697 deletions(-) diff --git a/src/main/java/org/geode/kafka/GeodeConnectorConfig.java b/src/main/java/org/apache/geode/kafka/GeodeConnectorConfig.java similarity index 99% rename from src/main/java/org/geode/kafka/GeodeConnectorConfig.java rename to src/main/java/org/apache/geode/kafka/GeodeConnectorConfig.java index 7fbfb55..476c07c 100644 --- a/src/main/java/org/geode/kafka/GeodeConnectorConfig.java +++ b/src/main/java/org/apache/geode/kafka/GeodeConnectorConfig.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.geode.kafka; +package org.apache.geode.kafka; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/org/geode/kafka/GeodeContext.java b/src/main/java/org/apache/geode/kafka/GeodeContext.java similarity index 99% rename from src/main/java/org/geode/kafka/GeodeContext.java rename to src/main/java/org/apache/geode/kafka/GeodeContext.java index 9f30242..02cc85f 100644 --- a/src/main/java/org/geode/kafka/GeodeContext.java +++ b/src/main/java/org/apache/geode/kafka/GeodeContext.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.geode.kafka; +package org.apache.geode.kafka; import static org.geode.kafka.GeodeConnectorConfig.SECURITY_CLIENT_AUTH_INIT; import static org.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; diff --git a/src/main/java/org/geode/kafka/LocatorHostPort.java b/src/main/java/org/apache/geode/kafka/LocatorHostPort.java similarity index 97% rename from src/main/java/org/geode/kafka/LocatorHostPort.java rename to src/main/java/org/apache/geode/kafka/LocatorHostPort.java index 5c71fa1..d879d8e 100644 --- a/src/main/java/org/geode/kafka/LocatorHostPort.java +++ b/src/main/java/org/apache/geode/kafka/LocatorHostPort.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.geode.kafka; +package org.apache.geode.kafka; public class LocatorHostPort { diff --git a/src/main/java/org/geode/kafka/security/SystemPropertyAuthInit.java b/src/main/java/org/apache/geode/kafka/security/SystemPropertyAuthInit.java similarity index 97% rename from src/main/java/org/geode/kafka/secu
[geode-kafka-connector] 06/06: Spotless and more apache renaming.
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git commit e58f29a1548f594efcbeef001cf6fddb68821c3f Author: Naburun Nag AuthorDate: Tue Feb 18 20:29:44 2020 -0800 Spotless and more apache renaming. --- .../java/org/apache/geode/kafka/GeodeContext.java | 6 ++--- .../apache/geode/kafka/sink/GeodeKafkaSink.java| 1 + .../geode/kafka/sink/GeodeKafkaSinkTask.java | 2 +- .../geode/kafka/sink/GeodeSinkConnectorConfig.java | 1 + .../geode/kafka/source/GeodeKafkaSource.java | 1 + .../geode/kafka/source/GeodeKafkaSourceTask.java | 2 +- .../kafka/source/GeodeSourceConnectorConfig.java | 1 + .../apache/geode/kafka/GeodeAsSinkDUnitTest.java | 2 +- .../apache/geode/kafka/GeodeAsSourceDUnitTest.java | 1 - .../kafka/security/SystemPropertyAuthInitTest.java | 28 ++ .../geode/kafka/sink/GeodeKafkaSinkTaskTest.java | 6 ++--- .../geode/kafka/sink/GeodeKafkaSinkTest.java | 3 ++- .../kafka/source/GeodeKafkaSourceTaskTest.java | 2 +- .../geode/kafka/source/GeodeKafkaSourceTest.java | 3 ++- .../source/GeodeSourceConnectorConfigTest.java | 3 ++- .../geode/kafka/utilities/GeodeKafkaTestUtils.java | 12 +- .../kafka/utilities/WorkerAndHerderWrapper.java| 2 +- .../kafka/security/SystemPropertyAuthInitTest.java | 27 - 18 files changed, 55 insertions(+), 48 deletions(-) diff --git a/src/main/java/org/apache/geode/kafka/GeodeContext.java b/src/main/java/org/apache/geode/kafka/GeodeContext.java index 02cc85f..8833fd9 100644 --- a/src/main/java/org/apache/geode/kafka/GeodeContext.java +++ b/src/main/java/org/apache/geode/kafka/GeodeContext.java @@ -14,9 +14,9 @@ */ package org.apache.geode.kafka; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_CLIENT_AUTH_INIT; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; -import static org.geode.kafka.GeodeConnectorConfig.SECURITY_USER; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_CLIENT_AUTH_INIT; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_PASSWORD; +import static org.apache.geode.kafka.GeodeConnectorConfig.SECURITY_USER; import java.util.List; diff --git a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java index e4754f7..2bdd99a 100644 --- a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java +++ b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSink.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; + import org.apache.geode.kafka.GeodeConnectorConfig; public class GeodeKafkaSink extends SinkConnector { diff --git a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java index 023284e..eaf0f66 100644 --- a/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java +++ b/src/main/java/org/apache/geode/kafka/sink/GeodeKafkaSinkTask.java @@ -22,13 +22,13 @@ import java.util.stream.Collectors; import org.apache.kafka.connect.sink.SinkRecord; import org.apache.kafka.connect.sink.SinkTask; -import org.apache.geode.kafka.GeodeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionExistsException; import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.kafka.GeodeContext; /** diff --git a/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java b/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java index 47eb165..b12eb8f 100644 --- a/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java +++ b/src/main/java/org/apache/geode/kafka/sink/GeodeSinkConnectorConfig.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; import org.apache.kafka.common.config.ConfigDef; + import org.apache.geode.kafka.GeodeConnectorConfig; public class GeodeSinkConnectorConfig extends GeodeConnectorConfig { diff --git a/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java b/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java index e8bfaf1..d2418fb 100644 --- a/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java +++ b/src/main/java/org/apache/geode/kafka/source/GeodeKafkaSource.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.source.SourceConnector; import org.apache.kafka.connect.util.ConnectorUtils; + import org.apache.geode.kafka.GeodeConnectorConfig; diff --git a/src/main/java/org/apache/
[geode-kafka-connector] 01/06: Adding geode-dunit to run the tests.
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git commit 035d794580148f71f30dd5e0eac640bfa7992308 Author: Naburun Nag AuthorDate: Mon Feb 10 16:32:16 2020 -0800 Adding geode-dunit to run the tests. --- build.gradle | 2 +- .../geode/kafka/GeodeKafkaConnectorTestBase.java | 171 .../java/org/geode/kafka/GeodeKafkaTestUtils.java | 176 + 3 files changed, 348 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2b7f853..33f9b9c 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ dependencies { testCompile(group: 'junit', name: 'junit', version: '4.12') testCompile('org.mockito:mockito-core:3.2.4') testCompile('pl.pragmatists:JUnitParams:1.1.1') - +testCompile(group: 'org.apache.geode', name: 'geode-dunit', version: '1.11.0') testImplementation 'org.awaitility:awaitility:4.0.2' } diff --git a/src/test/java/org/geode/kafka/GeodeKafkaConnectorTestBase.java b/src/test/java/org/geode/kafka/GeodeKafkaConnectorTestBase.java new file mode 100644 index 000..43723a9 --- /dev/null +++ b/src/test/java/org/geode/kafka/GeodeKafkaConnectorTestBase.java @@ -0,0 +1,171 @@ +/* + * 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 org.geode.kafka; + +import static org.awaitility.Awaitility.await; +import static org.geode.kafka.GeodeKafkaTestUtils.createConsumer; +import static org.geode.kafka.GeodeKafkaTestUtils.createTopic; +import static org.geode.kafka.GeodeKafkaTestUtils.deleteTopic; +import static org.geode.kafka.GeodeKafkaTestUtils.putDataIntoGeodeCluster; +import static org.geode.kafka.GeodeKafkaTestUtils.startGeodeClientAndRegion; +import static org.geode.kafka.GeodeKafkaTestUtils.startGeodeLocator; +import static org.geode.kafka.GeodeKafkaTestUtils.startGeodeServerAndCreateSourceRegion; +import static org.geode.kafka.GeodeKafkaTestUtils.startKafka; +import static org.geode.kafka.GeodeKafkaTestUtils.startWorkerAndHerderCluster; +import static org.geode.kafka.GeodeKafkaTestUtils.startZooKeeper; + +import java.io.IOException; +import java.time.Duration; +import java.util.Properties; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import kafka.zk.KafkaZkClient; +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.common.utils.Time; +import org.junit.After; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.rules.TestName; + +import org.apache.geode.test.dunit.Host; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.dunit.rules.ClusterStartupRule; +import org.apache.geode.test.version.VersionManager; + +public class GeodeKafkaConnectorTestBase { + @Rule + public ClusterStartupRule clusterStartupRule = new ClusterStartupRule(); + + @Rule + public TestName testName = new TestName(); + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + private static boolean debug = true; + + public static String TEST_REGION_TO_TOPIC_BINDINGS = "[someRegionForSource:someTopicForSource]"; + public static String TEST_TOPIC_TO_REGION_BINDINGS = "[someTopicForSink:someRegionForSink]"; + + public static String TEST_TOPIC_FOR_SOURCE = "someTopicForSource"; + public static String TEST_REGION_FOR_SOURCE = "someRegionForSource"; + public static String TEST_TOPIC_FOR_SINK = "someTopicForSink"; + public static String TEST_REGION_FOR_SINK = "someRegionForSink"; + + private static ZooKeeperLocalCluster zooKeeperLocalCluster; + private static KafkaLocalCluster kafkaLocalCluster; + private static GeodeLocalCluster geodeLocalCluster; + private static WorkerAndHerderCluster workerAndHerderCluster; + private static Consumer consumer; + + private static Properties getZooKeeperProperties() throws IOException { +Properties properties = new Properties(); +properties
[geode-kafka-connector] 02/06: Adding the dunit folder to the gitignore
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git commit 2011c929a1d88fa674e8079c58e34678db5dfe89 Author: Naburun Nag AuthorDate: Tue Feb 11 09:15:34 2020 -0800 Adding the dunit folder to the gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 74613b4..80b701f 100644 --- a/.gitignore +++ b/.gitignore @@ -234,4 +234,5 @@ dist/ nbdist/ .nb-gradle/ -.idea/ \ No newline at end of file +.idea/ +./dunit/
[geode-kafka-connector] 04/06: Fixing the sink test issue
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git commit 03ff7854355a8d33666921964f30f0404ff73fd7 Author: Naburun Nag AuthorDate: Tue Feb 18 19:39:43 2020 -0800 Fixing the sink test issue --- .gitignore | 2 +- dunit/locator/locator63530view.dat | Bin 198 -> 0 bytes .../java/org/geode/kafka/GeodeAsSinkDUnitTest.java | 20 .../java/org/geode/kafka/GeodeKafkaTestUtils.java | 1 - .../org/geode/kafka/LocatorLauncherWrapper.java | 3 +-- .../java/org/geode/kafka/ServerLauncherWrapper.java | 4 ++-- .../org/geode/kafka/WorkerAndHerderWrapper.java | 9 +++-- 7 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 80b701f..2e856f5 100644 --- a/.gitignore +++ b/.gitignore @@ -235,4 +235,4 @@ nbdist/ .nb-gradle/ .idea/ -./dunit/ +**/dunit diff --git a/dunit/locator/locator63530view.dat b/dunit/locator/locator63530view.dat deleted file mode 100644 index 10a68c2..000 Binary files a/dunit/locator/locator63530view.dat and /dev/null differ diff --git a/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java b/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java index 5c94575..b0a11e6 100644 --- a/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java +++ b/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java @@ -1,7 +1,6 @@ package org.geode.kafka; import static org.awaitility.Awaitility.await; -import static org.geode.kafka.GeodeKafkaTestUtils.createConsumer; import static org.geode.kafka.GeodeKafkaTestUtils.createProducer; import static org.geode.kafka.GeodeKafkaTestUtils.createTopic; import static org.geode.kafka.GeodeKafkaTestUtils.deleteTopic; @@ -10,15 +9,12 @@ import static org.geode.kafka.GeodeKafkaTestUtils.getZooKeeperProperties; import static org.geode.kafka.GeodeKafkaTestUtils.startKafka; import static org.geode.kafka.GeodeKafkaTestUtils.startWorkerAndHerderCluster; import static org.geode.kafka.GeodeKafkaTestUtils.startZooKeeper; -import static org.geode.kafka.GeodeKafkaTestUtils.verifyEventsAreConsumed; import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.module.scala.ser.SymbolSerializerModule; import kafka.zk.KafkaZkClient; -import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.utils.Time; @@ -39,7 +35,7 @@ import org.apache.geode.test.dunit.rules.ClientVM; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; -//@RunWith(Parameterized.class) +@RunWith(Parameterized.class) public class GeodeAsSinkDUnitTest { @Rule public ClusterStartupRule clusterStartupRule = new ClusterStartupRule(3); @@ -82,13 +78,13 @@ public class GeodeAsSinkDUnitTest { return Arrays.asList(new Object[][] {{1, 1}, {5, 10}, {15, 10}}); } - private /*final*/ int numTask = 1; - private /*final*/ int numPartition = 1; + private final int numTask; + private final int numPartition; -// public GeodeAsSinkDUnitTest(int numTask, int numPartition) { -//this.numTask = numTask; -//this.numPartition = numPartition; -// } + public GeodeAsSinkDUnitTest(int numTask, int numPartition) { +this.numTask = numTask; +this.numPartition = numPartition; + } @Test public void whenKafkaProducerProducesEventsThenGeodeMustReceiveTheseEvents() throws Exception { @@ -161,5 +157,5 @@ public class GeodeAsSinkDUnitTest { kafkaLocalCluster.stop(); } -} + } } diff --git a/src/test/java/org/geode/kafka/GeodeKafkaTestUtils.java b/src/test/java/org/geode/kafka/GeodeKafkaTestUtils.java index 27f9391..abe0d6a 100644 --- a/src/test/java/org/geode/kafka/GeodeKafkaTestUtils.java +++ b/src/test/java/org/geode/kafka/GeodeKafkaTestUtils.java @@ -148,7 +148,6 @@ public class GeodeKafkaTestUtils { await().atMost(10, TimeUnit.SECONDS).until(() -> { ConsumerRecords records = consumer.poll(Duration.ofSeconds(2)); for (ConsumerRecord record : records) { -System.out.println("NABA :: " + record); valueReceived.incrementAndGet(); } return valueReceived.get() == numEvents; diff --git a/src/test/java/org/geode/kafka/LocatorLauncherWrapper.java b/src/test/java/org/geode/kafka/LocatorLauncherWrapper.java index f0a0a1d..f24367c 100644 --- a/src/test/java/org/geode/kafka/LocatorLauncherWrapper.java +++ b/src/test/java/org/geode/kafka/LocatorLauncherWrapper.java @@ -14,7 +14,6 @@ */ package org.geode.kafka; -import java.io.File; import java.io.IOException; import java.util.Properties; @@ -30,7 +29,7 @@ public class LocatorLauncherWrapper { propert
[geode-kafka-connector] 03/06: adding the sink tests
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch feature/restructuring in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git commit 3e12e9ed322c5d5dfb9baa55533eb738f671cdc3 Author: Naburun Nag AuthorDate: Tue Feb 18 18:51:31 2020 -0800 adding the sink tests --- ConfigDiskDir_locator1/BACKUPcluster_config.if | Bin 0 -> 1048576 bytes ConfigDiskDir_locator1/BACKUPcluster_config_1.crf | Bin 0 -> 200 bytes ConfigDiskDir_locator1/BACKUPcluster_config_1.drf | Bin 0 -> 34 bytes ConfigDiskDir_locator1/BACKUPcluster_config_1.krf | Bin 0 -> 68 bytes ConfigDiskDir_locator1/BACKUPcluster_config_3.crf | Bin 0 -> 41 bytes ConfigDiskDir_locator1/BACKUPcluster_config_3.drf | Bin 0 -> 36 bytes build.gradle | 5 +- dunit/locator/locator63530view.dat | Bin 0 -> 198 bytes locator10334view.dat | Bin 0 -> 299 bytes .../java/org/geode/kafka/GeodeAsSinkDUnitTest.java | 165 .../org/geode/kafka/GeodeAsSourceDUnitTest.java| 171 + .../geode/kafka/GeodeKafkaConnectorTestBase.java | 171 - .../org/geode/kafka/GeodeKafkaTestCluster.java | 1 - .../java/org/geode/kafka/GeodeKafkaTestUtils.java | 132 +++- src/test/java/org/geode/kafka/JavaProcess.java | 12 +- .../org/geode/kafka/LocatorLauncherWrapper.java| 2 +- .../org/geode/kafka/ServerLauncherWrapper.java | 4 +- .../org/geode/kafka/WorkerAndHerderCluster.java| 7 + .../org/geode/kafka/WorkerAndHerderWrapper.java| 31 +++- .../org/geode/kafka/ZooKeeperLocalCluster.java | 1 + 20 files changed, 443 insertions(+), 259 deletions(-) diff --git a/ConfigDiskDir_locator1/BACKUPcluster_config.if b/ConfigDiskDir_locator1/BACKUPcluster_config.if new file mode 100644 index 000..8282543 Binary files /dev/null and b/ConfigDiskDir_locator1/BACKUPcluster_config.if differ diff --git a/ConfigDiskDir_locator1/BACKUPcluster_config_1.crf b/ConfigDiskDir_locator1/BACKUPcluster_config_1.crf new file mode 100644 index 000..6dd9f70 Binary files /dev/null and b/ConfigDiskDir_locator1/BACKUPcluster_config_1.crf differ diff --git a/ConfigDiskDir_locator1/BACKUPcluster_config_1.drf b/ConfigDiskDir_locator1/BACKUPcluster_config_1.drf new file mode 100644 index 000..f2b08ee Binary files /dev/null and b/ConfigDiskDir_locator1/BACKUPcluster_config_1.drf differ diff --git a/ConfigDiskDir_locator1/BACKUPcluster_config_1.krf b/ConfigDiskDir_locator1/BACKUPcluster_config_1.krf new file mode 100644 index 000..9151588 Binary files /dev/null and b/ConfigDiskDir_locator1/BACKUPcluster_config_1.krf differ diff --git a/ConfigDiskDir_locator1/BACKUPcluster_config_3.crf b/ConfigDiskDir_locator1/BACKUPcluster_config_3.crf new file mode 100644 index 000..319260f Binary files /dev/null and b/ConfigDiskDir_locator1/BACKUPcluster_config_3.crf differ diff --git a/ConfigDiskDir_locator1/BACKUPcluster_config_3.drf b/ConfigDiskDir_locator1/BACKUPcluster_config_3.drf new file mode 100644 index 000..0d6be92 Binary files /dev/null and b/ConfigDiskDir_locator1/BACKUPcluster_config_3.drf differ diff --git a/build.gradle b/build.gradle index 33f9b9c..add42c7 100644 --- a/build.gradle +++ b/build.gradle @@ -73,10 +73,11 @@ dependencies { testCompile(group: 'org.apache.kafka', name: 'connect-runtime', version: '2.3.1') testCompile(group: 'junit', name: 'junit', version: '4.12') +//testCompile("org.junit.jupiter:junit-jupiter-params:5.4.2") testCompile('org.mockito:mockito-core:3.2.4') testCompile('pl.pragmatists:JUnitParams:1.1.1') -testCompile(group: 'org.apache.geode', name: 'geode-dunit', version: '1.11.0') -testImplementation 'org.awaitility:awaitility:4.0.2' +testCompile(group: 'org.apache.geode', name: 'geode-dunit', version: '1.9.0') +testImplementation 'org.awaitility:awaitility:3.1.6' } shadowJar { diff --git a/dunit/locator/locator63530view.dat b/dunit/locator/locator63530view.dat new file mode 100644 index 000..10a68c2 Binary files /dev/null and b/dunit/locator/locator63530view.dat differ diff --git a/locator10334view.dat b/locator10334view.dat new file mode 100644 index 000..93a5f6e Binary files /dev/null and b/locator10334view.dat differ diff --git a/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java b/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java new file mode 100644 index 000..5c94575 --- /dev/null +++ b/src/test/java/org/geode/kafka/GeodeAsSinkDUnitTest.java @@ -0,0 +1,165 @@ +package org.geode.kafka; + +import static org.awaitility.Awaitility.await; +import static org.geode.kafka.GeodeKafkaTestUtils.createConsumer; +import static org.geode.kafka.GeodeKafkaTestUtils.createProducer; +import static org.geode.kafka.GeodeKafkaTestUtils.createTopic; +import static org.geode.kafka.GeodeKafkaTestUtils.deleteTopic; +import
[geode] branch release/1.12.0 updated: Feature/geode 7796: CI hang in LocatorDUnitTest.testCrashLocatorMultipleTimes (#4706)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a commit to branch release/1.12.0 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/release/1.12.0 by this push: new 290df3a Feature/geode 7796: CI hang in LocatorDUnitTest.testCrashLocatorMultipleTimes (#4706) 290df3a is described below commit 290df3a182c203c17e13bc7bc3cc8701ba326fc1 Author: Bruce Schuchardt AuthorDate: Tue Feb 18 12:44:00 2020 -0800 Feature/geode 7796: CI hang in LocatorDUnitTest.testCrashLocatorMultipleTimes (#4706) * GEODE-7796: CI failure in LocatorDUnitTest The new test hung during a CI run due to a flaw in Geode. I'm disabling it until the flaw is corrected. * reduce locator-wait-time (seconds, not millis) also several other changes to fix the underlying failure: 1) add a synchronization to the services restart thread so only one thread is active at a time 2) shut down membership cleanup executor and avoid creating multiple TcpServer executors on auto-reconnect 3) remove setting the locator as a dependent of the InternalDistributedSystem. This was causing locator.stop() to be invoked multiple times (as Dale noticed in his analysis) 4) when stopping a locator for auto-reconnect wait for it to stop in order to avoid creating multiple restart threads when there are cascading failures. (cherry picked from commit 71fafc83844d3c13a228c705d32df374e5630651) --- .../apache/geode/distributed/LocatorDUnitTest.java | 5 ++- .../distributed/internal/DistributionImpl.java | 2 +- .../internal/InternalDistributedSystem.java| 11 + .../distributed/internal/InternalLocator.java | 49 ++ .../internal/membership/gms/GMSMembership.java | 6 ++- .../gms/locator/MembershipLocatorImpl.java | 7 +++- .../distributed/internal/tcpserver/TcpServer.java | 4 +- 7 files changed, 43 insertions(+), 41 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java index 4771ff3..5dbe309 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java @@ -268,12 +268,15 @@ public class LocatorDUnitTest implements Serializable { properties.put(MAX_WAIT_TIME_RECONNECT, "" + (3 * memberTimeoutMS)); // since we're restarting location services let's be a little forgiving about that service // starting up so that stress-tests can pass -properties.put(LOCATOR_WAIT_TIME, "" + (3 * memberTimeoutMS)); +properties.put(LOCATOR_WAIT_TIME, "" + 3); addDSProps(properties); if (stateFile.exists()) { assertThat(stateFile.delete()).isTrue(); } +IgnoredException +.addIgnoredException("Possible loss of quorum due to the loss of 1 cache processes"); + Locator locator = Locator.startLocatorAndDS(port1, logFile, properties); system = (InternalDistributedSystem) locator.getDistributedSystem(); diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java index 8a3febc..20d2342 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionImpl.java @@ -919,7 +919,7 @@ public class DistributionImpl implements Distribution { // network-down testing InternalLocator loc = (InternalLocator) Locator.getLocator(); if (loc != null) { -loc.stop(true, !distribution.disableAutoReconnect, false); +loc.stop(true, !distribution.disableAutoReconnect, true); } } } diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index 584d101..823844f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -962,13 +962,6 @@ public class InternalDistributedSystem extends DistributedSystem } /** - * record a locator as a dependent of this distributed system - */ - void setDependentLocator(InternalLocator theLocator) { -startedLocator = theLocator; - } - - /** * Used by DistributionManager to fix bug 33362 */ void setDM(DistributionManager dm) { @@ -1624,8 +1617,8 @@ public class InternalDistributedSystem extends DistributedSystem dm.close(); // we close the
[geode] branch develop updated (71fafc8 -> 1befce1)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 71fafc8 Feature/geode 7796: CI hang in LocatorDUnitTest.testCrashLocatorMultipleTimes (#4706) add 1befce1 GEODE-7798: Fix flaky PubSub test (#4714) No new revisions were added by this update. Summary of changes: .../src/integrationTest/java/org/apache/geode/redis/PubSubTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] branch develop updated (54890b3 -> 71fafc8)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 54890b3 GEODE-7746: onServers function throws a NPE if the distributed system is shutdown (#4690) add 71fafc8 Feature/geode 7796: CI hang in LocatorDUnitTest.testCrashLocatorMultipleTimes (#4706) No new revisions were added by this update. Summary of changes: .../apache/geode/distributed/LocatorDUnitTest.java | 5 ++- .../distributed/internal/DistributionImpl.java | 2 +- .../internal/InternalDistributedSystem.java| 11 + .../distributed/internal/InternalLocator.java | 49 ++ .../internal/membership/gms/GMSMembership.java | 6 ++- .../gms/locator/MembershipLocatorImpl.java | 7 +++- .../distributed/internal/tcpserver/TcpServer.java | 4 +- 7 files changed, 43 insertions(+), 41 deletions(-)
[geode] branch develop updated (7bde96a -> 54890b3)
This is an automated email from the ASF dual-hosted git repository. jchen21 pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 7bde96a Fix for failing Postgres connector acceptance test (#4712) add 54890b3 GEODE-7746: onServers function throws a NPE if the distributed system is shutdown (#4690) No new revisions were added by this update. Summary of changes: .../apache/geode/modules/util/ClientServerSessionCacheDUnitTest.java | 4 ++-- .../org/apache/geode/cache/client/internal/ExecuteFunctionOp.java | 4 2 files changed, 6 insertions(+), 2 deletions(-)
[geode] branch develop updated (9f8a2ff -> 7bde96a)
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 9f8a2ff GEODE-7800: Add Redis PSUBSCRIBE and PUNSUBSCRIBE commands (#4705) add 7bde96a Fix for failing Postgres connector acceptance test (#4712) No new revisions were added by this update. Summary of changes: .../resources/org/apache/geode/connectors/jdbc/internal/postgres.yml | 1 + .../resources/org/apache/geode/connectors/jdbc/postgres.yml | 1 + 2 files changed, 2 insertions(+)