sarvekshayr commented on code in PR #10428:
URL: https://github.com/apache/ozone/pull/10428#discussion_r3385936972
##########
hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/CompactOMDB.java:
##########
@@ -58,22 +59,43 @@ public class CompactOMDB extends RepairTool {
)
private String nodeId;
+ @CommandLine.Option(names = {"--bottommost-level-compaction", "--blc"},
+ description = "BottommostLevelCompaction option for RocksDB compaction."
+
+ " Valid values: 0 (kSkip), 1 (kIfHaveCompactionFilter), 2 (kForce)."
+
+ " Default: 0 (kSkip).",
+ defaultValue = "0")
Review Comment:
```suggestion
description = "BottommostLevelCompaction option for RocksDB
compaction." +
" Valid values: 0 (kSkip), 1 (kIfHaveCompactionFilter), 2
(kForce).",
defaultValue = "0",
showDefaultValue = CommandLine.Help.Visibility.ALWAYS)
```
##########
hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/ldb/RocksDBManualCompaction.java:
##########
@@ -62,6 +62,13 @@ public class RocksDBManualCompaction extends RepairTool {
description = "Column family name")
private String columnFamilyName;
+ @CommandLine.Option(names = {"--bottommost-level-compaction", "--blc"},
+ description = "BottommostLevelCompaction option for RocksDB compaction."
+
+ " Valid values: 0 (kSkip), 1 (kIfHaveCompactionFilter), 2 (kForce)."
+
+ " Default: 0 (kSkip).",
+ defaultValue = "0")
Review Comment:
```suggestion
description = "BottommostLevelCompaction option for RocksDB
compaction." +
" Valid values: 0 (kSkip), 1 (kIfHaveCompactionFilter), 2
(kForce).",
defaultValue = "0",
showDefaultValue = CommandLine.Help.Visibility.ALWAYS)
```
##########
hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/ldb/RocksDBManualCompaction.java:
##########
@@ -96,11 +103,14 @@ public void execute() throws Exception {
" is not in a column family in DB for the given path.");
}
- info("Running compaction on " + columnFamilyName);
+ ManagedCompactRangeOptions.BottommostLevelCompaction blcOption =
+ getBottommostLevelCompaction(bottommostLevelCompaction);
+ info("Running compaction on " + columnFamilyName +
+ " with BottommostLevelCompaction=" + blcOption.name());
Review Comment:
```suggestion
" with bottommost level compaction: " + blcOption.name());
```
##########
hadoop-ozone/cli-repair/src/main/java/org/apache/hadoop/ozone/repair/om/CompactOMDB.java:
##########
@@ -58,22 +59,43 @@ public class CompactOMDB extends RepairTool {
)
private String nodeId;
+ @CommandLine.Option(names = {"--bottommost-level-compaction", "--blc"},
+ description = "BottommostLevelCompaction option for RocksDB compaction."
+
+ " Valid values: 0 (kSkip), 1 (kIfHaveCompactionFilter), 2 (kForce)."
+
+ " Default: 0 (kSkip).",
+ defaultValue = "0")
+ private int bottommostLevelCompaction;
+
@Override
public void execute() throws Exception {
OzoneConfiguration conf = getOzoneConf();
OMNodeDetails omNodeDetails = OMNodeDetails.getOMNodeDetailsFromConf(
conf, omServiceId, nodeId);
+ ManagedCompactRangeOptions.BottommostLevelCompaction blcOption =
+ getBottommostLevelCompaction(bottommostLevelCompaction);
if (!isDryRun()) {
try (OMAdminProtocolClientSideImpl omAdminProtocolClient =
OMAdminProtocolClientSideImpl.createProxyForSingleOM(conf,
UserGroupInformation.getCurrentUser(), omNodeDetails)) {
- omAdminProtocolClient.compactOMDB(columnFamilyName);
- info("Compaction request issued for om.db of om node: %s,
column-family: %s.", nodeId, columnFamilyName);
+ omAdminProtocolClient.compactOMDB(columnFamilyName,
blcOption.getValue());
+ info("Compaction request issued for om.db of om node: %s,
column-family: %s," +
+ " BottommostLevelCompaction=%s.", nodeId, columnFamilyName,
blcOption.name());
Review Comment:
```suggestion
"with bottommost level compaction: %s.", nodeId,
columnFamilyName, blcOption.name());
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/CompactDBUtil.java:
##########
@@ -40,11 +40,19 @@ private CompactDBUtil() {
public static void compactTable(OMMetadataManager omMetadataManager,
String tableName) throws IOException {
+ compactTable(omMetadataManager, tableName, 0);
+ }
+
+ public static void compactTable(OMMetadataManager omMetadataManager,
+ String tableName,
+ int bottommostLevelCompaction) throws IOException {
long startTime = Time.monotonicNow();
- LOG.info("Compacting column family: {}", tableName);
+ ManagedCompactRangeOptions.BottommostLevelCompaction blcOption =
+ getBottommostLevelCompaction(bottommostLevelCompaction);
+ LOG.info("Compacting column family: {} with BottommostLevelCompaction={}",
Review Comment:
```suggestion
LOG.info("Compacting column family: {} with {} bottommost level
compaction",
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
