smengcl commented on code in PR #11651: URL: https://github.com/apache/ozone/pull/11651#discussion_r4405299578
########## hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOptimizedSnapshotDiff.java: ########## @@ -0,0 +1,150 @@ +/* + * 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.hadoop.ozone.om.snapshot; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_PROPERTY; +import static org.apache.hadoop.ozone.om.helpers.BucketLayout.FILE_SYSTEM_OPTIMIZED; +import static org.apache.hadoop.ozone.om.helpers.BucketLayout.OBJECT_STORE; +import static org.apache.ozone.test.OzoneTestBase.uniqueObjectName; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.IOException; +import java.net.URI; +import java.util.Arrays; +import java.util.List; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport; +import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport.DiffReportEntry; +import org.apache.hadoop.ozone.DataTestUtil; +import org.apache.hadoop.ozone.OzoneConsts; +import org.apache.hadoop.ozone.client.OzoneBucket; +import org.apache.hadoop.ozone.client.OzoneClient; +import org.apache.hadoop.ozone.client.io.OzoneOutputStream; +import org.apache.hadoop.ozone.snapshot.SnapshotDiffReportOzone; +import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse; +import org.apache.ozone.test.GenericTestUtils; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +/** + * Optimized snapshot diff integration tests (single cluster, native SST diff enabled). + */ +@EnabledIfSystemProperty(named = ROCKS_TOOLS_NATIVE_PROPERTY, matches = "true") +public class TestOptimizedSnapshotDiff extends OmSnapshotTests { + + public TestOptimizedSnapshotDiff() throws Exception { + super(FILE_SYSTEM_OPTIMIZED, false, false, false, false, true); + } + + @Override + protected boolean isOptimizedSnapshotDiffOnlySuite() { + return true; + } + + @Test + public void testOptimizedDiffUnorderedThenOrdered() throws Exception { + String snap1 = "snap1"; + String snap2 = "snap2"; + String rootPath = String.format("%s://%s.%s/", + OzoneConsts.OZONE_URI_SCHEME, getBucketName(), getVolumeName()); + try (FileSystem fs = FileSystem.get(new URI(rootPath), getCluster().getConf())) { + createFileKey(fs, "/dir1/dir2/key1"); + createFileKey(fs, "/dir1/dir3/key1"); + createSnapshot(getVolumeName(), getBucketName(), snap1); + fs.rename(new Path("/dir1/dir2/key1"), new Path("/dir1/dir3/renamed_key")); + fs.delete(new Path("/dir1/dir2"), true); + createSnapshot(getVolumeName(), getBucketName(), snap2); + } + + List<DiffReportEntry> expectedUnordered = Arrays.asList( + SnapshotDiffReportOzone.getDiffReportEntry(SnapshotDiffReport.DiffType.DELETE, "dir1/dir2"), + SnapshotDiffReportOzone.getDiffReportEntry( + SnapshotDiffReport.DiffType.RENAME, "dir1/dir2/key1", "dir1/dir3/renamed_key")); + + List<DiffReportEntry> expectedOrdered = Arrays.asList( + SnapshotDiffReportOzone.getDiffReportEntry( + SnapshotDiffReport.DiffType.RENAME, "dir1/dir2/key1", "dir1/dir3/renamed_key"), + SnapshotDiffReportOzone.getDiffReportEntry(SnapshotDiffReport.DiffType.DELETE, "dir1/dir2")); + + SnapshotDiffResponse unordered = waitForDoneReportAfterOrderedSubmit( + getVolumeName(), getBucketName(), snap1, snap2, false); + assertEquals("Report is dependency unordered.", unordered.getReason()); + assertEquals(expectedUnordered, unordered.getSnapshotDiffReport().getDiffList()); + + SnapshotDiffResponse ordered = waitForDoneReportAfterOrderedSubmit( + getVolumeName(), getBucketName(), snap1, snap2, true); + assertEquals("Report is dependency ordered.", ordered.getReason()); + assertEquals(expectedOrdered, ordered.getSnapshotDiffReport().getDiffList()); + } + + @Test + public void testOptimizedObsDiff() throws Exception { + String volume = uniqueObjectName("vol-opt-obs-"); + String bucket = uniqueObjectName("buc-opt-obs-"); + OzoneBucket obsBucket; + try (OzoneClient obsClient = getCluster().newClient()) { + obsBucket = DataTestUtil.createVolumeAndBucket(obsClient, volume, bucket, OBJECT_STORE); + } + + String snap1 = "snap1"; + String snap2 = "snap2"; + String key1 = "key1"; + String key2 = "key2"; + String renamedKey = "key3"; + createObsKey(obsBucket, key1); + createObsKey(obsBucket, key2); + createSnapshot(volume, bucket, snap1); + obsBucket.renameKey(key2, renamedKey); + GenericTestUtils.waitFor(() -> { + try { + obsBucket.getKey(renamedKey); + return true; + } catch (IOException e) { + return false; + } + }, 300, 10000); + obsBucket.deleteKey(key1); + createSnapshot(volume, bucket, snap2); + + SnapshotDiffResponse response = waitForDoneReportAfterOrderedSubmit( + volume, bucket, snap1, snap2, false); + assertEquals("Report is dependency ordered.", response.getReason()); + assertThat(response.getSnapshotDiffReport().getDiffList()).containsExactlyInAnyOrder( + SnapshotDiffReportOzone.getDiffReportEntry(SnapshotDiffReport.DiffType.DELETE, key1), + SnapshotDiffReportOzone.getDiffReportEntry(SnapshotDiffReport.DiffType.RENAME, key2, renamedKey)); Review Comment: `obsClient` is closed as soon as the bucket is created, but `obsBucket` keeps using that client's `RpcClient` afterwards (`createObsKey`, `renameKey`, `getKey`, `deleteKey`). By then `close()` has already closed its OM failover proxy provider and its `XceiverClientManager`, and shut down its executors. It may still pass because the Hadoop IPC client is shared with the base class client, but that is luck rather than intent. Keeping the client open for the whole test avoids it: ```suggestion try (OzoneClient obsClient = getCluster().newClient()) { OzoneBucket obsBucket = DataTestUtil.createVolumeAndBucket(obsClient, volume, bucket, OBJECT_STORE); String snap1 = "snap1"; String snap2 = "snap2"; String key1 = "key1"; String key2 = "key2"; String renamedKey = "key3"; createObsKey(obsBucket, key1); createObsKey(obsBucket, key2); createSnapshot(volume, bucket, snap1); obsBucket.renameKey(key2, renamedKey); GenericTestUtils.waitFor(() -> { try { obsBucket.getKey(renamedKey); return true; } catch (IOException e) { return false; } }, 300, 10000); obsBucket.deleteKey(key1); createSnapshot(volume, bucket, snap2); SnapshotDiffResponse response = waitForDoneReportAfterOrderedSubmit( volume, bucket, snap1, snap2, false); assertEquals("Report is dependency ordered.", response.getReason()); assertThat(response.getSnapshotDiffReport().getDiffList()).containsExactlyInAnyOrder( SnapshotDiffReportOzone.getDiffReportEntry(SnapshotDiffReport.DiffType.DELETE, key1), SnapshotDiffReportOzone.getDiffReportEntry(SnapshotDiffReport.DiffType.RENAME, key2, renamedKey)); } ``` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
