Skip to content

HDDS-8389. [Snapshot] Added integration test for SnapDiff when OM leader failover happens #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smengcl merged 8 commits into from
May 23, 2023
Merged

HDDS-8389. [Snapshot] Added integration test for SnapDiff when OM leader failover happens #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
480b998
HDDS-8389. [Snapshot] Added integration test for SnapDiff when OM lea…
hemantk-12 May 3, 2023
0e65af6
Addressed review comments
hemantk-12 May 17, 2023
d6a4ae7
Updated tests
hemantk-12 May 17, 2023
9c3fedc
Enabled snapshot feature flag in TestOzoneManagerHA
hemantk-12 May 17, 2023
2a2086b
Merge branch 'master' into HDDS-8389
hemantk-12 May 18, 2023
3035b19
Merge branch 'master' into HDDS-8389
hemantk-12 May 20, 2023
477a0df
Fixed checkstyle
hemantk-12 May 20, 2023
16041f5
Increase random number count to 10 to reduce duplicacy
hemantk-12 May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 129 additions & 68 deletions hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
*/

package org.apache.hadoop.ozone.om;
import java.time.Duration;
import java.util.List;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
Expand All @@ -27,8 +29,8 @@
import org.apache.hadoop.hdds.utils.db.DBProfile;
import org.apache.hadoop.hdds.utils.db.RDBStore;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils;
import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport.DiffReportEntry;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
import org.apache.hadoop.ozone.TestDataUtil;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneBucket;
Expand Down Expand Up @@ -76,11 +78,16 @@

import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DB_PROFILE;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_FORCE_FULL_DIFF;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.CONTAINS_SNAPSHOT;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
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.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.DONE;
import static org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand Down Expand Up @@ -108,11 +115,8 @@ public class TestOmSnapshot {
private static boolean enabledFileSystemPaths;
private static boolean forceFullSnapshotDiff;
private static ObjectStore store;
private static OzoneConfiguration leaderConfig;
private static OzoneManager leaderOzoneManager;

private static OzoneManager ozoneManager;
private static RDBStore rdbStore;

private static OzoneBucket ozoneBucket;

@Rule
Expand All @@ -121,9 +125,9 @@ public class TestOmSnapshot {
@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(
new Object[]{OBJECT_STORE, false, false},
new Object[]{FILE_SYSTEM_OPTIMIZED, false, false},
new Object[]{BucketLayout.LEGACY, true, true});
new Object[]{OBJECT_STORE, false, false},
new Object[]{FILE_SYSTEM_OPTIMIZED, false, false},
new Object[]{BucketLayout.LEGACY, true, true});
}

public TestOmSnapshot(BucketLayout newBucketLayout,
Expand Down Expand Up @@ -158,41 +162,35 @@ private void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
String clusterId = UUID.randomUUID().toString();
String scmId = UUID.randomUUID().toString();
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
enabledFileSystemPaths);
conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
bucketLayout.name());
conf.setBoolean(OMConfigKeys.OZONE_OM_SNAPSHOT_FORCE_FULL_DIFF,
forceFullSnapshotDiff);
String omId = UUID.randomUUID().toString();
conf.setBoolean(OZONE_OM_ENABLE_FILESYSTEM_PATHS, enabledFileSystemPaths);
conf.set(OZONE_DEFAULT_BUCKET_LAYOUT, bucketLayout.name());
conf.setBoolean(OZONE_OM_SNAPSHOT_FORCE_FULL_DIFF, forceFullSnapshotDiff);
conf.setEnum(HDDS_DB_PROFILE, DBProfile.TEST);
// Enable filesystem snapshot feature for the test regardless of the default
conf.setBoolean(OMConfigKeys.OZONE_FILESYSTEM_SNAPSHOT_ENABLED_KEY, true);

cluster = MiniOzoneCluster.newOMHABuilder(conf)
cluster = MiniOzoneCluster.newBuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
.setOMServiceId("om-service-test1")
.setNumOfOzoneManagers(3)
.setOmId(omId)
.build();

cluster.waitForClusterToBeReady();
client = cluster.newClient();
// create a volume and a bucket to be used by OzoneFileSystem
ozoneBucket = TestDataUtil
.createVolumeAndBucket(client, bucketLayout);
volumeName = ozoneBucket.getVolumeName();
bucketName = ozoneBucket.getName();

leaderOzoneManager = ((MiniOzoneHAClusterImpl) cluster).getOMLeader();
leaderConfig = leaderOzoneManager.getConfiguration();
rdbStore =
(RDBStore) leaderOzoneManager.getMetadataManager().getStore();
cluster.setConf(leaderConfig);
ozoneManager = cluster.getOzoneManager();
rdbStore = (RDBStore) ozoneManager.getMetadataManager().getStore();

store = client.getObjectStore();
writeClient = store.getClientProxy().getOzoneManagerClient();

KeyManagerImpl keyManager = (KeyManagerImpl) HddsWhiteboxTestUtils
.getInternalState(leaderOzoneManager, "keyManager");
.getInternalState(ozoneManager, "keyManager");

// stop the deletion services so that keys can still be read
keyManager.stop();
Expand Down Expand Up @@ -846,12 +844,12 @@ private String createSnapshot(String volName, String buckName,
store.createSnapshot(volName, buckName, snapshotName);
String snapshotKeyPrefix =
OmSnapshotManager.getSnapshotPrefix(snapshotName);
SnapshotInfo snapshotInfo =
leaderOzoneManager.getMetadataManager().getSnapshotInfoTable()
.get(SnapshotInfo.getTableKey(volName, buckName, snapshotName));
SnapshotInfo snapshotInfo = ozoneManager.getMetadataManager()
.getSnapshotInfoTable()
.get(SnapshotInfo.getTableKey(volName, buckName, snapshotName));
String snapshotDirName =
OmSnapshotManager.getSnapshotPath(leaderConfig, snapshotInfo) +
OM_KEY_PREFIX + "CURRENT";
OmSnapshotManager.getSnapshotPath(ozoneManager.getConfiguration(),
snapshotInfo) + OM_KEY_PREFIX + "CURRENT";
GenericTestUtils
.waitFor(() -> new File(snapshotDirName).exists(), 1000, 120000);
return snapshotKeyPrefix;
Expand All @@ -875,45 +873,6 @@ private String createFileKey(OzoneBucket bucket, String keyPrefix)
return key;
}

@Test
public void testUniqueSnapshotId()
throws IOException, InterruptedException, TimeoutException {
createFileKey(ozoneBucket, "key");

String snapshotName = UUID.randomUUID().toString();
store.createSnapshot(volumeName, bucketName, snapshotName);
List<OzoneManager> ozoneManagers = ((MiniOzoneHAClusterImpl) cluster)
.getOzoneManagersList();
List<String> snapshotIds = new ArrayList<>();

for (OzoneManager ozoneManager : ozoneManagers) {
GenericTestUtils.waitFor(
() -> {
SnapshotInfo snapshotInfo;
try {
snapshotInfo = ozoneManager.getMetadataManager()
.getSnapshotInfoTable()
.get(
SnapshotInfo.getTableKey(volumeName,
bucketName,
snapshotName)
);
} catch (IOException e) {
throw new RuntimeException(e);
}

if (snapshotInfo != null) {
snapshotIds.add(snapshotInfo.getSnapshotID());
}
return snapshotInfo != null;
},
1000,
120000);
}

assertEquals(1, snapshotIds.stream().distinct().count());
}

@Test
public void testSnapshotOpensWithDisabledAutoCompaction() throws Exception {
String snapPrefix = createSnapshot(volumeName, bucketName);
Expand All @@ -929,6 +888,108 @@ public void testSnapshotOpensWithDisabledAutoCompaction() throws Exception {
}
}

// Test snapshot diff when OM restarts in non-HA OM env and diff job is
// in_progress when it restarts.
@Test
public void testSnapshotDiffWhenOmRestart()
throws IOException, InterruptedException {
String snapshot1 = "snap-" + RandomStringUtils.randomNumeric(5);
String snapshot2 = "snap-" + RandomStringUtils.randomNumeric(5);
createSnapshots(snapshot1, snapshot2);

SnapshotDiffResponse response = store.snapshotDiff(volumeName, bucketName,
snapshot1, snapshot2, null, 0, false);

assertEquals(IN_PROGRESS, response.getJobStatus());

// Restart the OM and wait for sometime to make sure that previous snapDiff
// job finishes.
cluster.restartOzoneManager();
await().atMost(Duration.ofSeconds(120)).
until(() -> cluster.getOzoneManager().isRunning());

response = store.snapshotDiff(volumeName, bucketName,
snapshot1, snapshot2, null, 0, false);

// If job was IN_PROGRESS or DONE state when OM restarted, it should be
// DONE by this time.
// If job FAILED during crash (which mostly happens in the test because
Copy link
Contributor

@swamirishi swamirishi May 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Do we have a unit test case for the FAILED state?

Copy link
Contributor Author

@hemantk-12 hemantk-12 May 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No integration test for FAILED state. I added few tests as unit test in PR: https://github.com/apache/ozone/pull/4716/files#diff-11392a9810b911a6b87f9f4440cb5e5342b2a9c112851e7dceafa5103d999e1dR427

// of active snapshot checks), it would be removed by clean up service on
// startup, and request after clean up will be considered a new request
// and would return IN_PROGRESS. No other state is expected other than
// IN_PROGRESS and DONE.
if (response.getJobStatus() == DONE) {
assertEquals(100, response.getSnapshotDiffReport().getDiffList().size());
} else if (response.getJobStatus() == IN_PROGRESS) {
SnapshotDiffReportOzone diffReport =
fetchReportPage(snapshot1, snapshot2, null, 0);
assertEquals(100, diffReport.getDiffList().size());
} else {
fail("Unexpected job status for the test.");
}
}

// Test snapshot diff when OM restarts in non-HA OM env and report is
// partially received.
@Test
public void testSnapshotDiffWhenOmRestartAndReportIsPartiallyFetched()
throws IOException, InterruptedException {
int pageSize = 10;
String snapshot1 = "snap-" + RandomStringUtils.randomNumeric(5);
String snapshot2 = "snap-" + RandomStringUtils.randomNumeric(5);
createSnapshots(snapshot1, snapshot2);

SnapshotDiffReportOzone diffReport = fetchReportPage(snapshot1, snapshot2,
null, pageSize);

List<DiffReportEntry> diffReportEntries = diffReport.getDiffList();
String nextToken = diffReport.getToken();

// Restart the OM and no need to wait because snapDiff job finished before
// the restart.
cluster.restartOzoneManager();
await().atMost(Duration.ofSeconds(120)).
until(() -> cluster.getOzoneManager().isRunning());

while (nextToken == null || StringUtils.isNotEmpty(nextToken)) {
diffReport = fetchReportPage(snapshot1, snapshot2, nextToken, pageSize);
diffReportEntries.addAll(diffReport.getDiffList());
nextToken = diffReport.getToken();
}
assertEquals(100, diffReportEntries.size());
}

private SnapshotDiffReportOzone fetchReportPage(String fromSnapshot,
String toSnapshot,
String token,
int pageSize)
throws IOException, InterruptedException {

while (true) {
SnapshotDiffResponse response = store.snapshotDiff(volumeName, bucketName,
fromSnapshot, toSnapshot, token, pageSize, false);
if (response.getJobStatus() == IN_PROGRESS) {
Thread.sleep(response.getWaitTimeInMs());
} else if (response.getJobStatus() == DONE) {
return response.getSnapshotDiffReport();
} else {
fail("Unexpected job status for the test.");
}
}
}

private void createSnapshots(String snapshot1,
String snapshot2) throws IOException {
createFileKey(ozoneBucket, "key");
store.createSnapshot(volumeName, bucketName, snapshot1);

for (int i = 0; i < 100; i++) {
createFileKey(ozoneBucket, "key-" + i);
}

store.createSnapshot(volumeName, bucketName, snapshot2);
}

@Test
public void testCompactionDagDisableForSnapshotMetadata() throws Exception {
String snapshotName = createSnapshot(volumeName, bucketName);
Expand Down
2 changes: 2 additions & 0 deletions ...p-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ public static void init() throws Exception {
conf.setLong(
OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_AUTO_TRIGGER_THRESHOLD_KEY,
SNAPSHOT_THRESHOLD);
// Enable filesystem snapshot feature for the test regardless of the default
conf.setBoolean(OMConfigKeys.OZONE_FILESYSTEM_SNAPSHOT_ENABLED_KEY, true);

// Some subclasses check RocksDB directly as part of their tests. These
// depend on OBS layout.
Expand Down
Loading