This is an automated email from the ASF dual-hosted git repository.
jmark99 pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new c3358c0d83 Rename setgoal/getgoal to sethostinggoal/gethostinggoal
(#3842)
c3358c0d83 is described below
commit c3358c0d8398319f29ff2cbd7b643e324f26e1b7
Author: Mark Owens <jmar...@apache.org>
AuthorDate: Fri Oct 13 07:54:33 2023 -0400
Rename setgoal/getgoal to sethostinggoal/gethostinggoal (#3842)
Rename the setgoal and getgoal shell commands to sethostinggoal and
gethostinggoal, respectively. This change is being made to provide more clarity
as to what the commands are doing and make them less generic.
Several other instances if 'goal' were changed to 'hostinggoal' in order to
add more clarity.
Closes #3800
---
.../commands/GetTabletHostingGoalCommand.java | 2 +-
.../commands/SetTabletHostingGoalCommand.java | 12 +++---
.../apache/accumulo/test/shell/ShellServerIT.java | 46 +++++++++++-----------
3 files changed, 31 insertions(+), 29 deletions(-)
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/GetTabletHostingGoalCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/GetTabletHostingGoalCommand.java
index 39033a7c12..1588e2924c 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/GetTabletHostingGoalCommand.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/GetTabletHostingGoalCommand.java
@@ -34,7 +34,7 @@ public class GetTabletHostingGoalCommand extends
TableOperation {
@Override
public String getName() {
- return "getgoal";
+ return "gethostinggoal";
}
@Override
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/SetTabletHostingGoalCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/SetTabletHostingGoalCommand.java
index 414d3f60a7..e68d2ab248 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/SetTabletHostingGoalCommand.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/SetTabletHostingGoalCommand.java
@@ -39,11 +39,11 @@ public class SetTabletHostingGoalCommand extends
TableOperation {
private Option goalOpt;
private Range range;
- private TabletHostingGoal goal;
+ private TabletHostingGoal hostingGoal;
@Override
public String getName() {
- return "setgoal";
+ return "sethostinggoal";
}
@Override
@@ -54,8 +54,10 @@ public class SetTabletHostingGoalCommand extends
TableOperation {
@Override
protected void doTableOp(final Shell shellState, final String tableName)
throws AccumuloException, AccumuloSecurityException,
TableNotFoundException, IOException {
-
shellState.getAccumuloClient().tableOperations().setTabletHostingGoal(tableName,
range, goal);
- Shell.log.debug("Set goal state: {} on table: {}, range: {}", goal,
tableName, range);
+
shellState.getAccumuloClient().tableOperations().setTabletHostingGoal(tableName,
range,
+ hostingGoal);
+ Shell.log.debug("Set hosting goal state: {} on table: {}, range: {}",
hostingGoal, tableName,
+ range);
}
@Override
@@ -80,7 +82,7 @@ public class SetTabletHostingGoalCommand extends
TableOperation {
this.range = new Range(startRow, startInclusive, endRow, endInclusive);
}
- this.goal =
TabletHostingGoal.valueOf(cl.getOptionValue(goalOpt).toUpperCase());
+ this.hostingGoal =
TabletHostingGoal.valueOf(cl.getOptionValue(goalOpt).toUpperCase());
return super.execute(fullCommand, cl, shellState);
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
index 93710c8023..3efa258654 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
@@ -1233,14 +1233,14 @@ public class ShellServerIT extends
SharedMiniClusterBase {
}
@Test
- public void testSetGoalCommand() throws Exception {
+ public void testSetHostingGoalCommand() throws Exception {
final String table = getUniqueNames(1)[0];
ts.exec("createtable " + table);
ts.exec("addsplits -t " + table + " a c e g");
- String result = ts.exec("setgoal -?");
+ String result = ts.exec("sethostinggoal -?");
assertTrue(result.contains("Sets the hosting goal"));
- ts.exec("setgoal -t " + table + " -b a -e a -g never");
- ts.exec("setgoal -t " + table + " -b c -e e -ee -g always");
+ ts.exec("sethostinggoal -t " + table + " -b a -e a -g never");
+ ts.exec("sethostinggoal -t " + table + " -b c -e e -ee -g always");
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build();
Scanner s = client.createScanner(MetadataTable.NAME,
Authorizations.EMPTY)) {
String tableId = getTableId(table);
@@ -1263,7 +1263,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
}
@Test
- public void testGetGoalCommand() throws Exception {
+ public void testGetHostingGoalCommand() throws Exception {
SortedSet<Text> splits =
Sets.newTreeSet(Arrays.asList(new Text("d"), new Text("m"), new
Text("s")));
@@ -1275,12 +1275,12 @@ public class ShellServerIT extends
SharedMiniClusterBase {
splitsFilePath = createSplitsFile("splitsFile", splits);
ts.exec("createtable " + tableName + " -sf " +
splitsFilePath.toAbsolutePath(), true);
- String result = ts.exec("getgoal -?");
- assertTrue(result.contains("usage: getgoal"));
+ String result = ts.exec("gethostinggoal -?");
+ assertTrue(result.contains("usage: gethostinggoal"));
String tableId = getTableId(tableName);
- result = ts.exec("getgoal");
+ result = ts.exec("gethostinggoal");
assertTrue(result.contains("TABLE: " + tableName));
assertTrue(result.contains("TABLET ID HOSTING GOAL"));
assertTrue(result.contains(tableId + ";d< ONDEMAND"));
@@ -1288,20 +1288,20 @@ public class ShellServerIT extends
SharedMiniClusterBase {
assertTrue(result.contains(tableId + ";s;m ONDEMAND"));
assertTrue(result.contains(tableId + "<;s ONDEMAND"));
- ts.exec("setgoal -g ALWAYS -r p");
- result = ts.exec("getgoal -r p");
+ ts.exec("sethostinggoal -g ALWAYS -r p");
+ result = ts.exec("gethostinggoal -r p");
assertFalse(result.contains(tableId + ";d< ONDEMAND"));
assertFalse(result.contains(tableId + ";m;d ONDEMAND"));
assertTrue(result.contains(tableId + ";s;m ALWAYS"));
assertFalse(result.contains(tableId + "<;s ONDEMAND"));
- result = ts.exec("getgoal");
+ result = ts.exec("gethostinggoal");
assertTrue(result.contains(tableId + ";d< ONDEMAND"));
assertTrue(result.contains(tableId + ";m;d ONDEMAND"));
assertTrue(result.contains(tableId + ";s;m ALWAYS"));
assertTrue(result.contains(tableId + "<;s ONDEMAND"));
- result = ts.exec("getgoal -b f -e p");
+ result = ts.exec("gethostinggoal -b f -e p");
assertFalse(result.contains(tableId + ";d< ONDEMAND"));
assertTrue(result.contains(tableId + ";m;d ONDEMAND"));
assertTrue(result.contains(tableId + ";s;m ALWAYS"));
@@ -1316,7 +1316,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
// Verify that when splits are added after table creation, hosting goals are
set properly
@Test
- public void testGetGoalCommand_DelayedSplits() throws Exception {
+ public void testGetHostingGoalCommand_DelayedSplits() throws Exception {
for (int i = 0; i < 40; i++) {
ts.exec("createtable tab" + i, true);
@@ -1328,7 +1328,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
String tableId = getTableId(tableName[0]);
- String result = ts.exec("getgoal");
+ String result = ts.exec("gethostinggoal");
assertTrue(result.contains("TABLE: " + tableName[0]));
assertTrue(result.contains("TABLET ID HOSTING GOAL"));
@@ -1336,7 +1336,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
// add the splits and check goals again
ts.exec("addsplits d m s", true);
- result = ts.exec("getgoal");
+ result = ts.exec("gethostinggoal");
assertTrue(result.matches("(?s).*" + tableId + "[;]d<\\s+ONDEMAND.*"));
assertTrue(result.matches("(?s).*" + tableId + ";m;d\\s+ONDEMAND.*"));
assertTrue(result.matches("(?s).*" + tableId + ";s;m\\s+ONDEMAND.*"));
@@ -1353,13 +1353,13 @@ public class ShellServerIT extends
SharedMiniClusterBase {
String tableId2 = getTableId(tableName[1]);
- result = ts.exec("getgoal");
+ result = ts.exec("gethostinggoal");
assertTrue(result.contains("TABLE: " + tableName[1]));
assertTrue(result.contains("TABLET ID HOSTING GOAL"));
assertTrue(result.matches("(?s).*" + tableId2 + "<<\\s+ALWAYS.*"));
ts.exec("addsplits d m s", true);
- result = ts.exec("getgoal");
+ result = ts.exec("gethostinggoal");
assertTrue(result.matches("(?s).*" + tableId2 + ";d<\\s+ALWAYS.*"));
assertTrue(result.matches("(?s).*" + tableId2 + ";m;d\\s+ALWAYS.*"));
assertTrue(result.matches("(?s).*" + tableId2 + ";s;m\\s+ALWAYS.*"));
@@ -1852,8 +1852,8 @@ public class ShellServerIT extends SharedMiniClusterBase {
final String table = getUniqueNames(1)[0];
ts.exec("createtable " + table);
ts.exec("addsplits -t " + table + " a c e g m t");
- ts.exec("setgoal -t " + table + " -b a -e a -g never");
- ts.exec("setgoal -t " + table + " -b c -e e -ee -g always");
+ ts.exec("sethostinggoal -t " + table + " -b a -e a -g never");
+ ts.exec("sethostinggoal -t " + table + " -b c -e e -ee -g always");
ts.exec("scan -t " + table + " -np -b a -e c", false);
ts.exec("scan -t " + table + " -np -b a -e e", false);
@@ -2282,19 +2282,19 @@ public class ShellServerIT extends
SharedMiniClusterBase {
ts.exec("createtable " + table1, true);
ts.exec("addsplits g n u", true);
- ts.exec("setgoal -g always -r g", true);
- ts.exec("setgoal -g always -r u", true);
+ ts.exec("sethostinggoal -g always -r g", true);
+ ts.exec("sethostinggoal -g always -r u", true);
insertData(table1, 1000, 3);
ts.exec("compact -w -t " + table1);
ts.exec("scan -t " + table1);
ts.exec("createtable " + table2, true);
ts.exec("addsplits f m t", true);
- ts.exec("setgoal -g always -r n", true);
+ ts.exec("sethostinggoal -g always -r n", true);
insertData(table2, 500, 5);
ts.exec("compact -t " + table2);
ts.exec("scan -t " + table1);
- ts.exec("setgoal -r g -t " + table2 + " -g NEVER");
+ ts.exec("sethostinggoal -r g -t " + table2 + " -g NEVER");
// give tablet time to become unassigned
for (var i = 0; i < 15; i++) {
