Skip to content

HDDS-12229. Remove Incorrect Warning for OBS Bucket in Namespace CLI Commands #7832

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
ArafatKhan2198 merged 5 commits into from
Feb 17, 2025
Merged

HDDS-12229. Remove Incorrect Warning for OBS Bucket in Namespace CLI Commands #7832

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
881a743
HDDS-12229. Remove Incorrect Warning for OBS Bucket in Namespace CLI …
Feb 7, 2025
cd9f62d
HDDS-12229. Remove Incorrect Warning for OBS Bucket in Namespace CLI …
Feb 7, 2025
0bd4b3d
HDDS-12229. Remove Incorrect Warning for OBS Bucket in Namespace CLI …
Feb 13, 2025
77b3a50
HDDS-12229. Remove Incorrect Warning for OBS Bucket in Namespace CLI …
Feb 13, 2025
f9743f9
Merge remote-tracking branch 'origin/master' into HDDS-12229
adoroszlai Feb 16, 2025
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
1 change: 0 additions & 1 deletion ...zone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestNSSummaryAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ public void testNSSummaryCLIOBS() throws UnsupportedEncodingException {
String path = "/" + volumeName + "/" + bucketOBS;
executeAdminCommands(path);
// Should throw warning, since bucket is in OBS bucket layout.
assertThat(getOutContentString()).contains("[Warning] Namespace CLI is not designed for OBS bucket layout.");
assertThat(getOutContentString()).contains("Put more files into it to visualize DU");
assertThat(getOutContentString()).contains("Put more files into it to visualize file size distribution");
}
Expand Down
5 changes: 0 additions & 5 deletions ...e/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/FileSizeDistSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.makeHttpCall;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printEmptyPathRequest;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printBucketReminder;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printNewLines;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printPathNotFound;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printSpaces;
Expand Down Expand Up @@ -79,10 +78,6 @@ public Void call() throws Exception {
} else if ("TYPE_NOT_APPLICABLE".equals(distResponse.path("status").asText())) {
printTypeNA("File Size Distribution");
} else {
if (parent.isNotValidBucketOrOBSBucket(path)) {
printBucketReminder();
}

printWithUnderline("File Size Distribution", true);
JsonNode fileSizeDist = distResponse.path("dist");
double sum = 0;
Expand Down
10 changes: 0 additions & 10 deletions ...-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryCLIUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,6 @@ public static void printWithUnderline(String str, boolean newLine) {
}
}

public static void printBucketReminder() {
printNewLines(1);
System.out.println(
"[Warning] Namespace CLI is not designed for OBS bucket layout.\n" +
"Bucket being accessed must be of type FILE_SYSTEM_OPTIMIZED " +
"bucket layout or \nLEGACY bucket layout with " +
"'ozone.om.enable.filesystem.paths' set to true.");
printNewLines(1);
}

public static String parseInputPath(String path) {
if (!path.startsWith("ofs://")) {
return path;
Expand Down
5 changes: 0 additions & 5 deletions ...one/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/QuotaUsageSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.makeHttpCall;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printEmptyPathRequest;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printBucketReminder;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printKVSeparator;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printNewLines;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printPathNotFound;
Expand Down Expand Up @@ -80,10 +79,6 @@ public Void call() throws Exception {
} else if ("TYPE_NOT_APPLICABLE".equals(quotaResponse.path("status").asText())) {
printTypeNA("Quota");
} else {
if (parent.isNotValidBucketOrOBSBucket(path)) {
printBucketReminder();
}

printWithUnderline("Quota", true);

long quotaAllowed = quotaResponse.get("allowed").asLong();
Expand Down
5 changes: 0 additions & 5 deletions ...-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/SummarySubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.makeHttpCall;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.parseInputPath;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printEmptyPathRequest;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printBucketReminder;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printKVSeparator;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printNewLines;
import static org.apache.hadoop.ozone.admin.nssummary.NSSummaryCLIUtils.printPathNotFound;
Expand Down Expand Up @@ -76,10 +75,6 @@ public Void call() throws Exception {
if ("PATH_NOT_FOUND".equals(summaryResponse.path("status").asText())) {
printPathNotFound();
} else {
if (parent.isNotValidBucketOrOBSBucket(path)) {
printBucketReminder();
}

printWithUnderline("Entity Type", false);
printKVSeparator();
System.out.println(summaryResponse.get("type"));
Expand Down