GEODE-8685: change export to not deserialize region values (#5735)
Modified test to fail if it attempts to deserialize values during export.
Fixed product export code to no longer deserialize and test now passes.
Co-authored-by: Darrel Schneider <dschneider@vmware.com>
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java
index 717c9f0..84809f0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntrySnapshot.java
@@ -123,6 +123,20 @@
return v;
}
+ /**
+ * If the value is available as a CachedDeserializable instance then return it.
+ * Otherwise behave as if getValue() was called.
+ */
+ public Object getValuePreferringCachedDeserializable() {
+ checkEntryDestroyed();
+ Object value = regionEntry.getValue(null);
+ if (value instanceof CachedDeserializable) {
+ return value;
+ } else {
+ return getRawValue();
+ }
+ }
+
@Override
public Object getValue() {
checkEntryDestroyed();
@@ -281,5 +295,4 @@
}
this.regionEntry.fromData(in);
}
-
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
index 06c8982..4c99229 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/SnapshotPacket.java
@@ -25,6 +25,7 @@
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.NonTXEntry;
import org.apache.geode.internal.cache.Token;
@@ -75,6 +76,10 @@
} finally {
OffHeapHelper.release(v);
}
+ } else if (entry instanceof EntrySnapshot) {
+ EntrySnapshot entrySnapshot = (EntrySnapshot) entry;
+ Object entryValue = entrySnapshot.getValuePreferringCachedDeserializable();
+ value = convertToBytes(entryValue);
} else {
value = convertToBytes(entry.getValue());
}
diff --git a/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java b/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
index 1529eca..9a2d597 100644
--- a/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
+++ b/geode-gfsh/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
@@ -20,6 +20,9 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.stream.IntStream;
@@ -30,6 +33,8 @@
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -53,10 +58,29 @@
@Rule
public TemporaryFolder tempDir = new TemporaryFolder();
- private Region<String, String> region;
+ private Region<String, Object> region;
private Path snapshotFile;
private Path snapshotDir;
+ public static class StringWrapper implements DataSerializable {
+
+ private String value;
+
+ public StringWrapper(String string) {
+ value = string;
+ }
+
+ @Override
+ public void toData(DataOutput out) throws IOException {
+ DataSerializer.writeString(value, out);
+ }
+
+ @Override
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ throw new ClassNotFoundException("Should never be deserialized");
+ }
+ }
+
@Before
public void setup() throws Exception {
gfsh.connectAndVerify(server.getEmbeddedLocatorPort(), GfshCommandRule.PortType.locator);
@@ -69,6 +93,7 @@
@Test
public void testExport() {
+ loadRegion(new StringWrapper("value"));
String exportCommand = buildBaseExportCommand()
.addOption(CliStrings.EXPORT_DATA__FILE, snapshotFile.toString()).getCommandString();
gfsh.executeAndAssertThat(exportCommand).statusIsSuccess();
@@ -158,7 +183,7 @@
assertFalse(Files.exists(snapshotDir));
}
- private void loadRegion(String value) {
+ private void loadRegion(Object value) {
IntStream.range(0, DATA_POINTS).forEach(i -> region.put("key" + i, value));
}
