This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 3f1a7edf6e HDDS-10696. Fix test failure caused by empty snapshot
installation (#6659)
3f1a7edf6e is described below
commit 3f1a7edf6e4eb48643132b072dea96bf71cdc049
Author: Hemant Kumar <[email protected]>
AuthorDate: Thu May 9 00:16:43 2024 -0700
HDDS-10696. Fix test failure caused by empty snapshot installation (#6659)
---
.../apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java | 2 --
.../org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java | 13 +++++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
index da0f82d470..463f44bf05 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
@@ -47,7 +47,6 @@ import
org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StringUtils;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.tag.Flaky;
import org.apache.ratis.grpc.server.GrpcLogAppender;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
@@ -184,7 +183,6 @@ public class TestAddRemoveOzoneManager {
* OM.
*/
@Test
- @Flaky("HDDS-7880")
public void testBootstrap() throws Exception {
setupCluster(1);
OzoneManager oldOM = cluster.getOzoneManager();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
index cc8acc4834..6d2832c913 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.hdds.recon.ReconConfig;
import org.apache.hadoop.hdds.utils.DBCheckpointServlet;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.hdds.utils.db.RDBCheckpointUtils;
+import org.apache.hadoop.hdds.utils.db.RDBStore;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.ozone.OzoneConsts;
@@ -317,8 +318,7 @@ public class OMDBCheckpointServlet extends
DBCheckpointServlet {
// Get the snapshot files.
Set<Path> snapshotPaths = waitForSnapshotDirs(checkpoint);
- Path snapshotDir = Paths.get(OMStorage.getOmDbDir(getConf()).toString(),
- OM_SNAPSHOT_DIR);
+ Path snapshotDir = getSnapshotDir();
if (!processDir(snapshotDir, copyFiles, hardLinkFiles, sstFilesToExclude,
snapshotPaths, excluded, copySize, null)) {
return false;
@@ -635,6 +635,15 @@ public class OMDBCheckpointServlet extends
DBCheckpointServlet {
.getConfiguration();
}
+ private Path getSnapshotDir() {
+ OzoneManager om = (OzoneManager)
getServletContext().getAttribute(OzoneConsts.OM_CONTEXT_ATTRIBUTE);
+ RDBStore store = (RDBStore) om.getMetadataManager().getStore();
+ // store.getSnapshotsParentDir() returns path to checkpointState (e.g.
<om-data-dir>/db.snapshots/checkpointState)
+ // But we need to return path till db.snapshots which contains
checkpointState and diffState.
+ // So that whole snapshots and compaction information can be transferred
to follower.
+ return Paths.get(store.getSnapshotsParentDir()).getParent();
+ }
+
@Override
public BootstrapStateHandler.Lock getBootstrapStateLock() {
return lock;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
