You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@geode.apache.org by GitBox <gi...@apache.org> on 2020/12/02 01:56:06 UTC
[GitHub] [geode] jchen21 opened a new pull request #5801: [DO NOT REVIEW] GEODE-8665
jchen21 opened a new pull request #5801:
URL: https://github.com/apache/geode/pull/5801
Thank you for submitting a contribution to Apache Geode.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `develop`)?
- [ ] Is your initial contribution a single, squashed commit?
- [ ] Does `gradlew build` run cleanly?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
### Note:
Please ensure that once the PR is submitted, check Concourse for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] jchen21 commented on a change in pull request #5801: GEODE-8665: validate offline-disk-store command is missing information
Posted by GitBox <gi...@apache.org>.
jchen21 commented on a change in pull request #5801:
URL: https://github.com/apache/geode/pull/5801#discussion_r542812368
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
##########
@@ -2225,6 +2225,12 @@ long recoverCrf(OplogEntryIdSet deletedIds, boolean recoverValues, boolean recov
if (getParent().isOfflineCompacting()) {
getParent().incLiveEntryCount(getRecoveryMap().size());
}
+ long tc = totalCount.get();
+ long tlc = totalLiveCount.get();
+ if (getParent().isValidating() && tlc >= 0
+ && tc > tlc) {
Review comment:
Yes. It is valid. It is very common for tc(totalCount) and tlc(totalLiveCount) to be the same value, including 0, which indicates an empty Oplog. When tc and tlc are the same, offline disk store validation will not show any message about the number of records that would be removed if you compacted the store, since there is no deleted or skipped entry in this case.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #5801: GEODE-8665: validate offline-disk-store command is missing information
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #5801:
URL: https://github.com/apache/geode/pull/5801#discussion_r542832250
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ValidateOfflineDiskStoreDUnitTest.java
##########
@@ -0,0 +1,281 @@
+/*
+ * 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.apache.geode.internal.cache;
+
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
+import static org.apache.geode.test.dunit.Disconnect.disconnectAllFromDS;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.apache.geode.test.dunit.VM.getVM;
+import static org.apache.geode.test.dunit.VM.getVMId;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.IntStream;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.distributed.LocatorLauncher;
+import org.apache.geode.distributed.ServerLauncher;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.lang.SystemPropertyHelper;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
+
+public class ValidateOfflineDiskStoreDUnitTest implements Serializable {
+
+ @Rule
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
+
+ @Rule
+ public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
+
+ @Rule
+ public DistributedRule distributedRule = new DistributedRule(2);
+
+ private String locatorName;
+
+ private File locatorDir;
+
+ private int locatorPort;
+
+ private int locatorJmxPort;
+
+ private static final LocatorLauncher DUMMY_LOCATOR = mock(LocatorLauncher.class);
+
+ private static final AtomicReference<LocatorLauncher> LOCATOR =
+ new AtomicReference<>(DUMMY_LOCATOR);
+
+ private VM server;
+
+ private String serverName;
+
+ private File serverDir;
+
+ private int serverPort;
+
+ private String locators;
+
+ private static final ServerLauncher DUMMY_SERVER = mock(ServerLauncher.class);
+
+ private static final AtomicReference<ServerLauncher> SERVER =
+ new AtomicReference<>(DUMMY_SERVER);
+
+ private final int NUM_ENTRIES = 1000;
+
+ private static final String DISK_STORE_NAME = "testDiskStore";
+
+ private static final String REGION_NAME = "testRegion";
+
+ @Before
+ public void setUp() throws Exception {
+ VM locator = getVM(0);
+ server = getVM(1);
+
+ locatorName = "locator";
+ serverName = "server";
+
+ locatorDir = temporaryFolder.newFolder(locatorName);
+
+ serverDir = temporaryFolder.newFolder(serverName);
+
+ int[] port = getRandomAvailableTCPPorts(3);
+ locatorPort = port[0];
+ locatorJmxPort = port[1];
+ serverPort = port[2];
+
+ locators = "localhost[" + locatorPort + "]";
+
+ locator.invoke(() -> startLocator(locatorName, locatorDir, locatorPort, locatorJmxPort));
+
+ gfsh.connectAndVerify(locatorJmxPort, GfshCommandRule.PortType.jmxManager);
+
+ server.invoke(() -> startServer(serverName, serverDir, serverPort, locators));
+ }
+
+ @After
+ public void tearDown() {
+ invokeInEveryVM(() -> {
+ SERVER.getAndSet(DUMMY_SERVER).stop();
+ LOCATOR.getAndSet(DUMMY_LOCATOR).stop();
+ });
+ disconnectAllFromDS();
+ }
+
+ @Test
+ public void testValidateOfflineDiskStoreInfo() {
+
+ createDiskStore();
+
+ createRegion();
+
+ populateRegions();
+
+ AssertRegionSizeAndDiskStore();
+
+ server.invoke(ValidateOfflineDiskStoreDUnitTest::stopServer);
+
+ server.invoke(() -> {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ PrintStream originalSystemOut = System.out;
+ System.setOut(new PrintStream(byteArrayOutputStream));
+ validateOfflineDiskStore();
+ assertThat(byteArrayOutputStream.toString())
+ .contains("Disk store contains " + NUM_ENTRIES + " compactable records.");
+ System.setOut(originalSystemOut);
+ });
+
+ }
+
+ private void validateOfflineDiskStore() throws Exception {
+ DiskStoreImpl.offlineValidate(DISK_STORE_NAME, new File[] {serverDir});
+ }
+
+ private static void startLocator(String name, File workingDirectory, int locatorPort,
+ int jmxPort) {
+ LOCATOR.set(new LocatorLauncher.Builder()
+ .setMemberName(name)
+ .setPort(locatorPort)
+ .setWorkingDirectory(workingDirectory.getAbsolutePath())
+ .set(JMX_MANAGER, "true")
+ .set(JMX_MANAGER_PORT, String.valueOf(jmxPort))
+ .set(JMX_MANAGER_START, "true")
+ .set(LOG_FILE, new File(workingDirectory, name + ".log").getAbsolutePath())
+ .set(MAX_WAIT_TIME_RECONNECT, "1000")
+ .set(MEMBER_TIMEOUT, "2000")
+ .build());
+
+ LOCATOR.get().start();
+
+ await().untilAsserted(() -> {
+ InternalLocator locator = (InternalLocator) LOCATOR.get().getLocator();
+ assertThat(locator.isSharedConfigurationRunning())
+ .as("Locator shared configuration is running on locator" + getVMId())
+ .isTrue();
+ });
+ }
+
+ private static void startServer(String name, File workingDirectory, int serverPort,
+ String locators) {
+
+ System.setProperty(GEODE_PREFIX + SystemPropertyHelper.PARALLEL_DISK_STORE_RECOVERY,
+ "true");
+
+ SERVER.set(new ServerLauncher.Builder()
+ .setDeletePidFileOnStop(Boolean.TRUE)
+ .setMemberName(name)
+ .setWorkingDirectory(workingDirectory.getAbsolutePath())
+ .setServerPort(serverPort)
+ .set(HTTP_SERVICE_PORT, "0")
+ .set(LOCATORS, locators)
+ .set(LOG_FILE, new File(workingDirectory, name + ".log").getAbsolutePath())
+ .set(MAX_WAIT_TIME_RECONNECT, "1000")
+ .set(MEMBER_TIMEOUT, "2000")
+ .build());
+
+ SERVER.get().start();
+ }
+
+ private static void stopServer() {
+ SERVER.get().stop();
+ }
+
+ private void AssertRegionSizeAndDiskStore() {
Review comment:
method name should starts with lower case.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] jchen21 commented on a change in pull request #5801: GEODE-8665: validate offline-disk-store command is missing information
Posted by GitBox <gi...@apache.org>.
jchen21 commented on a change in pull request #5801:
URL: https://github.com/apache/geode/pull/5801#discussion_r542840591
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ValidateOfflineDiskStoreDUnitTest.java
##########
@@ -0,0 +1,281 @@
+/*
+ * 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.apache.geode.internal.cache;
+
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
+import static org.apache.geode.test.dunit.Disconnect.disconnectAllFromDS;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.apache.geode.test.dunit.VM.getVM;
+import static org.apache.geode.test.dunit.VM.getVMId;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.IntStream;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.distributed.LocatorLauncher;
+import org.apache.geode.distributed.ServerLauncher;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.lang.SystemPropertyHelper;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedRule;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
+
+public class ValidateOfflineDiskStoreDUnitTest implements Serializable {
+
+ @Rule
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
+
+ @Rule
+ public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder();
+
+ @Rule
+ public DistributedRule distributedRule = new DistributedRule(2);
+
+ private String locatorName;
+
+ private File locatorDir;
+
+ private int locatorPort;
+
+ private int locatorJmxPort;
+
+ private static final LocatorLauncher DUMMY_LOCATOR = mock(LocatorLauncher.class);
+
+ private static final AtomicReference<LocatorLauncher> LOCATOR =
+ new AtomicReference<>(DUMMY_LOCATOR);
+
+ private VM server;
+
+ private String serverName;
+
+ private File serverDir;
+
+ private int serverPort;
+
+ private String locators;
+
+ private static final ServerLauncher DUMMY_SERVER = mock(ServerLauncher.class);
+
+ private static final AtomicReference<ServerLauncher> SERVER =
+ new AtomicReference<>(DUMMY_SERVER);
+
+ private final int NUM_ENTRIES = 1000;
+
+ private static final String DISK_STORE_NAME = "testDiskStore";
+
+ private static final String REGION_NAME = "testRegion";
+
+ @Before
+ public void setUp() throws Exception {
+ VM locator = getVM(0);
+ server = getVM(1);
+
+ locatorName = "locator";
+ serverName = "server";
+
+ locatorDir = temporaryFolder.newFolder(locatorName);
+
+ serverDir = temporaryFolder.newFolder(serverName);
+
+ int[] port = getRandomAvailableTCPPorts(3);
+ locatorPort = port[0];
+ locatorJmxPort = port[1];
+ serverPort = port[2];
+
+ locators = "localhost[" + locatorPort + "]";
+
+ locator.invoke(() -> startLocator(locatorName, locatorDir, locatorPort, locatorJmxPort));
+
+ gfsh.connectAndVerify(locatorJmxPort, GfshCommandRule.PortType.jmxManager);
+
+ server.invoke(() -> startServer(serverName, serverDir, serverPort, locators));
+ }
+
+ @After
+ public void tearDown() {
+ invokeInEveryVM(() -> {
+ SERVER.getAndSet(DUMMY_SERVER).stop();
+ LOCATOR.getAndSet(DUMMY_LOCATOR).stop();
+ });
+ disconnectAllFromDS();
+ }
+
+ @Test
+ public void testValidateOfflineDiskStoreInfo() {
+
+ createDiskStore();
+
+ createRegion();
+
+ populateRegions();
+
+ AssertRegionSizeAndDiskStore();
+
+ server.invoke(ValidateOfflineDiskStoreDUnitTest::stopServer);
+
+ server.invoke(() -> {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ PrintStream originalSystemOut = System.out;
+ System.setOut(new PrintStream(byteArrayOutputStream));
+ validateOfflineDiskStore();
+ assertThat(byteArrayOutputStream.toString())
+ .contains("Disk store contains " + NUM_ENTRIES + " compactable records.");
+ System.setOut(originalSystemOut);
+ });
+
+ }
+
+ private void validateOfflineDiskStore() throws Exception {
+ DiskStoreImpl.offlineValidate(DISK_STORE_NAME, new File[] {serverDir});
+ }
+
+ private static void startLocator(String name, File workingDirectory, int locatorPort,
+ int jmxPort) {
+ LOCATOR.set(new LocatorLauncher.Builder()
+ .setMemberName(name)
+ .setPort(locatorPort)
+ .setWorkingDirectory(workingDirectory.getAbsolutePath())
+ .set(JMX_MANAGER, "true")
+ .set(JMX_MANAGER_PORT, String.valueOf(jmxPort))
+ .set(JMX_MANAGER_START, "true")
+ .set(LOG_FILE, new File(workingDirectory, name + ".log").getAbsolutePath())
+ .set(MAX_WAIT_TIME_RECONNECT, "1000")
+ .set(MEMBER_TIMEOUT, "2000")
+ .build());
+
+ LOCATOR.get().start();
+
+ await().untilAsserted(() -> {
+ InternalLocator locator = (InternalLocator) LOCATOR.get().getLocator();
+ assertThat(locator.isSharedConfigurationRunning())
+ .as("Locator shared configuration is running on locator" + getVMId())
+ .isTrue();
+ });
+ }
+
+ private static void startServer(String name, File workingDirectory, int serverPort,
+ String locators) {
+
+ System.setProperty(GEODE_PREFIX + SystemPropertyHelper.PARALLEL_DISK_STORE_RECOVERY,
+ "true");
+
+ SERVER.set(new ServerLauncher.Builder()
+ .setDeletePidFileOnStop(Boolean.TRUE)
+ .setMemberName(name)
+ .setWorkingDirectory(workingDirectory.getAbsolutePath())
+ .setServerPort(serverPort)
+ .set(HTTP_SERVICE_PORT, "0")
+ .set(LOCATORS, locators)
+ .set(LOG_FILE, new File(workingDirectory, name + ".log").getAbsolutePath())
+ .set(MAX_WAIT_TIME_RECONNECT, "1000")
+ .set(MEMBER_TIMEOUT, "2000")
+ .build());
+
+ SERVER.get().start();
+ }
+
+ private static void stopServer() {
+ SERVER.get().stop();
+ }
+
+ private void AssertRegionSizeAndDiskStore() {
Review comment:
Good catch!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou merged pull request #5801: GEODE-8665: validate offline-disk-store command is missing information
Posted by GitBox <gi...@apache.org>.
gesterzhou merged pull request #5801:
URL: https://github.com/apache/geode/pull/5801
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #5801: GEODE-8665: validate offline-disk-store command is missing information
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #5801:
URL: https://github.com/apache/geode/pull/5801#discussion_r542497519
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
##########
@@ -2225,6 +2225,12 @@ long recoverCrf(OplogEntryIdSet deletedIds, boolean recoverValues, boolean recov
if (getParent().isOfflineCompacting()) {
getParent().incLiveEntryCount(getRecoveryMap().size());
}
+ long tc = totalCount.get();
+ long tlc = totalLiveCount.get();
+ if (getParent().isValidating() && tlc >= 0
+ && tc > tlc) {
Review comment:
Can there be a case where tc and tlc both are same number (including 0); in that case dead-record-counts are 0; is this valid?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org