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 f1205dc8ca7 HDDS-16378. Skip creating completion marker file in
`upgrade-container-schema --dry-run` (#11198)
f1205dc8ca7 is described below
commit f1205dc8ca7b0d73dd524409326908113a31b04a
Author: Mark Tsai <[email protected]>
AuthorDate: Sat Sep 19 00:35:56 2026 +0800
HDDS-16378. Skip creating completion marker file in
`upgrade-container-schema --dry-run` (#11198)
---
.../repair/datanode/schemaupgrade/UpgradeContainerSchema.java | 4 ++--
.../datanode/schemaupgrade/TestUpgradeContainerSchema.java | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
index fc2feef2135..4c4586e481e 100644
---
a/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
+++
b/hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/UpgradeContainerSchema.java
@@ -311,7 +311,7 @@ public CompletableFuture<VolumeUpgradeResult>
getUpgradeFuture() {
final File file =
UpgradeUtils.getVolumeUpgradeCompleteFile(r.getHddsVolume());
// create a flag file
- if (e == null && r.isSuccess()) {
+ if (e == null && r.isSuccess() && !isDryRun()) {
try {
UpgradeUtils.createFile(file);
} catch (IOException ioe) {
@@ -321,7 +321,7 @@ public CompletableFuture<VolumeUpgradeResult>
getUpgradeFuture() {
if (lockFile.exists()) {
boolean deleted = lockFile.delete();
if (!deleted) {
- error("Failed to delete upgrade lock file %s.", file);
+ error("Failed to delete upgrade lock file %s.", lockFile);
}
}
});
diff --git
a/hadoop-ozone/cli-repair/src/test/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/TestUpgradeContainerSchema.java
b/hadoop-ozone/cli-repair/src/test/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/TestUpgradeContainerSchema.java
index f8983e23a9e..84dc09a2244 100644
---
a/hadoop-ozone/cli-repair/src/test/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/TestUpgradeContainerSchema.java
+++
b/hadoop-ozone/cli-repair/src/test/java/org/apache/hadoop/ozone/repair/datanode/schemaupgrade/TestUpgradeContainerSchema.java
@@ -219,6 +219,15 @@ void testUpgrade(boolean dryRun) throws IOException {
}
}
+ for (HddsVolume volume : volumes) {
+ File completeFile = UpgradeUtils.getVolumeUpgradeCompleteFile(volume);
+ if (dryRun) {
+ assertThat(completeFile).doesNotExist();
+ } else {
+ assertThat(completeFile).exists();
+ }
+ }
+
if (!dryRun) {
checkV3MetaData(keyValueContainerBlockDataMap, results);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
