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 048572adcb HDDS-10845. Let some Freon generators use empty prefix by
default (#6673)
048572adcb is described below
commit 048572adcb11e38889944a26d5c8d4b3d94e2adc
Author: Hongbing Wang <[email protected]>
AuthorDate: Tue May 14 23:59:12 2024 +0800
HDDS-10845. Let some Freon generators use empty prefix by default (#6673)
---
.../org/apache/hadoop/ozone/freon/BaseFreonGenerator.java | 15 ++++++++++++---
.../apache/hadoop/ozone/freon/OmMetadataGenerator.java | 4 ++++
.../ozone/freon/OzoneClientKeyReadWriteListOps.java | 5 +++++
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/BaseFreonGenerator.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/BaseFreonGenerator.java
index f9dccadb11..20acad0562 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/BaseFreonGenerator.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/BaseFreonGenerator.java
@@ -285,7 +285,7 @@ public class BaseFreonGenerator {
attemptCounter = new AtomicLong(0);
if (prefix.length() == 0) {
- prefix = RandomStringUtils.randomAlphanumeric(10).toLowerCase();
+ prefix = !allowEmptyPrefix() ?
RandomStringUtils.randomAlphanumeric(10).toLowerCase() : "";
} else {
//replace environment variables to support multi-node execution
prefix = resolvePrefix(prefix);
@@ -306,8 +306,8 @@ public class BaseFreonGenerator {
"Invalid command, "
+ "the testNo must be a positive integer");
}
- LOG.info("Executing test with prefix {} " +
- "and number-of-tests {}", prefix, testNo);
+ LOG.info("Executing test with prefix {} and number-of-tests {}",
+ prefix.isEmpty() ? "''" : prefix, testNo);
pathSchema = new PathSchema(prefix);
@@ -541,6 +541,15 @@ public class BaseFreonGenerator {
return dig.digest(stream);
}
+ /**
+ * When no prefix is specified,
+ * if allowEmptyPrefix is false, a random prefix will be used;
+ * if allowEmptyPrefix is true, an empty prefix will be used.
+ */
+ public boolean allowEmptyPrefix() {
+ return false;
+ }
+
public String getPrefix() {
return prefix;
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OmMetadataGenerator.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OmMetadataGenerator.java
index 60af701e14..24060b0bac 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OmMetadataGenerator.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OmMetadataGenerator.java
@@ -461,4 +461,8 @@ public class OmMetadataGenerator extends BaseFreonGenerator
}
}
+ @Override
+ public boolean allowEmptyPrefix() {
+ return true;
+ }
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyReadWriteListOps.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyReadWriteListOps.java
index 022eacde4a..ba7456ef64 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyReadWriteListOps.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/OzoneClientKeyReadWriteListOps.java
@@ -271,4 +271,9 @@ public class OzoneClientKeyReadWriteListOps extends
BaseFreonGenerator
}
return keyNameSb.toString();
}
+
+ @Override
+ public boolean allowEmptyPrefix() {
+ return true;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
