Skip to content

HDDS-11578. Rename snapshot dir constant in OzoneConsts #7310

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
adoroszlai merged 1 commit into from
Oct 17, 2024
Merged

HDDS-11578. Rename snapshot dir constant in OzoneConsts #7310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import java.util.List;

import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.ozone.OzoneConsts.SCM_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEFAULT_SERVICE_ID;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_SERVICE_IDS_KEY;

Expand Down Expand Up @@ -159,7 +159,7 @@ public static String getSCMRatisSnapshotDirectory(ConfigurationSource conf) {
OZONE_METADATA_DIRS);
File metaDirPath = ServerUtils.getOzoneMetaDirPath(conf);
snapshotDir =
Paths.get(metaDirPath.getPath(), SCM_RATIS_SNAPSHOT_DIR).toString();
Paths.get(metaDirPath.getPath(), OZONE_RATIS_SNAPSHOT_DIR).toString();
}
return snapshotDir;
}
Expand Down
5 changes: 1 addition & 4 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,7 @@ private OzoneConsts() {
// should remain prepared even after a restart.
public static final String PREPARE_MARKER = "prepareMarker";

// TODO : rename this to OZONE_RATIS_SNAPSHOT_DIR and use it in both
// SCM and OM
public static final String OM_RATIS_SNAPSHOT_DIR = "snapshot";
public static final String SCM_RATIS_SNAPSHOT_DIR = "snapshot";
public static final String OZONE_RATIS_SNAPSHOT_DIR = "snapshot";

public static final long DEFAULT_OM_UPDATE_ID = -1L;

Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
import static org.apache.hadoop.ozone.OzoneConsts.OM_METRICS_TEMP_FILE;
import static org.apache.hadoop.ozone.OzoneConsts.OM_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.OzoneConsts.PREPARE_MARKER_KEY;
import static org.apache.hadoop.ozone.OzoneConsts.OM_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.OzoneConsts.RPC_PORT;
import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_KEY_DELETING_LIMIT_PER_TASK;
Expand Down Expand Up @@ -1494,7 +1494,7 @@ private void initializeRatisDirs(OzoneConfiguration conf) throws IOException {
// snapshot directory in Ratis storage directory. if yes, move it to
// new snapshot directory.

File snapshotDir = new File(omRatisDirectory, OM_RATIS_SNAPSHOT_DIR);
File snapshotDir = new File(omRatisDirectory, OZONE_RATIS_SNAPSHOT_DIR);

if (snapshotDir.isDirectory()) {
FileUtils.moveDirectory(snapshotDir.toPath(),
Expand Down
4 changes: 2 additions & 2 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
import org.slf4j.LoggerFactory;

import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.ozone.OzoneConsts.OM_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_DIR;
import static org.apache.hadoop.ozone.om.OzoneManagerUtils.getBucketLayout;

Expand Down Expand Up @@ -484,7 +484,7 @@ public static String getOMRatisSnapshotDirectory(ConfigurationSource conf) {
OZONE_OM_RATIS_SNAPSHOT_DIR, OZONE_METADATA_DIRS);
File metaDirPath = ServerUtils.getOzoneMetaDirPath(conf);
snapshotDir = Paths.get(metaDirPath.getPath(),
OM_RATIS_SNAPSHOT_DIR).toString();
OZONE_RATIS_SNAPSHOT_DIR).toString();
}
return snapshotDir;
}
Expand Down