Skip to content

HDDS-4492. CLI flag --quota should default to 'spaceQuota' to preserve backward compatibility. #1609

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
avijayanhwx merged 2 commits into from
Nov 24, 2020
Merged

HDDS-4492. CLI flag --quota should default to 'spaceQuota' to preserve backward compatibility. #1609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb3d51
HDDS-4492. CLI flag --quota should default to 'spaceQuota' to preserv…
ayushtkn Nov 22, 2020
703098e
Add to --quota to names.
ayushtkn Nov 24, 2020
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
42 changes: 42 additions & 0 deletions ...-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.List;
Expand All @@ -36,6 +37,7 @@
import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.test.GenericTestUtils;
Expand All @@ -48,6 +50,8 @@
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -525,4 +529,42 @@ public void testDeleteToTrashOrSkipTrash() throws Exception {
}
}

@Test
public void testShQuota() throws IOException {
ObjectStore objectStore = cluster.getClient().getObjectStore();
try {
// Test --quota option.

String[] args =
new String[] {"volume", "create", "vol1", "--quota", "100BYTES"};
execute(ozoneShell, args);
assertEquals(100, objectStore.getVolume("vol1").getQuotaInBytes());
out.reset();

args =
new String[] {"bucket", "create", "vol1/buck1", "--quota", "10BYTES"};
execute(ozoneShell, args);
assertEquals(10,
objectStore.getVolume("vol1").getBucket("buck1").getQuotaInBytes());

// Test --space-quota option.

args = new String[] {"volume", "create", "vol2", "--space-quota",
"100BYTES"};
execute(ozoneShell, args);
assertEquals(100, objectStore.getVolume("vol2").getQuotaInBytes());
out.reset();

args = new String[] {"bucket", "create", "vol2/buck2", "--space-quota",
"10BYTES"};
execute(ozoneShell, args);
assertEquals(10,
objectStore.getVolume("vol2").getBucket("buck2").getQuotaInBytes());
} finally {
objectStore.getVolume("vol1").deleteBucket("buck1");
objectStore.deleteVolume("vol1");
objectStore.getVolume("vol2").deleteBucket("buck2");
objectStore.deleteVolume("vol2");
}
}
}
8 changes: 7 additions & 1 deletion hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/SetSpaceQuotaOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,21 @@ public class SetSpaceQuotaOptions {

@CommandLine.Option(names = {"--space-quota"},
description = "The maximum space quota can be used (eg. 1GB)")

private String quotaInBytes;

@CommandLine.Option(names = {"--count-quota"},
description = "For volume this parameter represents the number of " +
"buckets, and for buckets represents the number of keys (eg. 5)")
private long quotaInCounts;

// Hidden option, added for backward compatibility.
@CommandLine.Option(names = {"--quota"}, hidden = true,
description = "Deprecated use --space-quota")
private String quotaInBytesDep;

public String getQuotaInBytes() {
return quotaInBytes;
return quotaInBytes != null ? quotaInBytes : quotaInBytesDep;
}

public long getQuotaInCounts() {
Expand Down