This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 48259029eb Increase timeouts in ManagerAssignmentIT to address CI
failures (#3643)
48259029eb is described below
commit 48259029eb8e6a488a88dbc8f6e9fe8bd82bed89
Author: EdColeman <[email protected]>
AuthorDate: Fri Jul 21 15:46:39 2023 +0000
Increase timeouts in ManagerAssignmentIT to address CI failures (#3643)
- Increase the witFor timeout to 60 seconds from default 30.
- IDE checkstyle suggestions.
---
.../test/functional/ManagerAssignmentIT.java | 120 ++++++++++-----------
1 file changed, 59 insertions(+), 61 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
index 676de69ef1..a9c8904f98 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.test.functional;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -125,7 +126,8 @@ public class ManagerAssignmentIT extends
AccumuloClusterHarness {
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
- Wait.waitFor(() -> client.instanceOperations().getTabletServers().size()
== 1);
+ Wait.waitFor(() -> client.instanceOperations().getTabletServers().size()
== 1,
+ SECONDS.toMillis(60), SECONDS.toMillis(2));
client.tableOperations().create(tableName);
@@ -143,25 +145,22 @@ public class ManagerAssignmentIT extends
AccumuloClusterHarness {
final CountDownLatch latch = new CountDownLatch(10);
- Runnable task = new Runnable() {
- @Override
- public void run() {
- while (true) {
- try (var scanner = new
IsolatedScanner(client.createScanner(tableName))) {
- // TODO maybe do not close scanner? The following limit was
placed on the stream to
- // avoid reading all the data possibly leaving a scan session
active on the tserver
- int count = 0;
- for (Entry<Key,Value> e : scanner) {
- count++;
- // let the test thread know that this thread has read some data
- if (count == 1_000) {
- latch.countDown();
- }
+ Runnable task = () -> {
+ while (true) {
+ try (var scanner = new
IsolatedScanner(client.createScanner(tableName))) {
+ // TODO maybe do not close scanner? The following limit was placed
on the stream to
+ // avoid reading all the data possibly leaving a scan session
active on the tserver
+ int count = 0;
+ for (Entry<Key,Value> e : scanner) {
+ count++;
+ // let the test thread know that this thread has read some data
+ if (count == 1_000) {
+ latch.countDown();
}
- } catch (Exception e) {
- e.printStackTrace();
- break;
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ break;
}
}
};
@@ -180,29 +179,28 @@ public class ManagerAssignmentIT extends
AccumuloClusterHarness {
Locations locs = client.tableOperations().locate(tableName,
Collections.singletonList(TabletsSection.getRange()));
- locs.groupByTablet().keySet().stream().map(tid ->
locs.getTabletLocation(tid))
- .forEach(location -> {
- HostAndPort address = HostAndPort.fromString(location);
- String addressWithSession = address.toString();
- var zLockPath =
ServiceLock.path(getCluster().getServerContext().getZooKeeperRoot()
- + Constants.ZTSERVERS + "/" + address.toString());
- long sessionId =
-
ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(),
zLockPath);
- if (sessionId != 0) {
- addressWithSession = address.toString() + "[" +
Long.toHexString(sessionId) + "]";
- }
+
locs.groupByTablet().keySet().stream().map(locs::getTabletLocation).forEach(location
-> {
+ HostAndPort address = HostAndPort.fromString(location);
+ String addressWithSession = address.toString();
+ var zLockPath =
ServiceLock.path(getCluster().getServerContext().getZooKeeperRoot()
+ + Constants.ZTSERVERS + "/" + address);
+ long sessionId =
+
ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(),
zLockPath);
+ if (sessionId != 0) {
+ addressWithSession = address + "[" + Long.toHexString(sessionId) +
"]";
+ }
- final String finalAddress = addressWithSession;
- System.out.println("Attempting to shutdown TabletServer at: " +
address.toString());
- try {
- ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
- c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
- getCluster().getServerContext().rpcCreds(),
finalAddress, false));
- } catch (AccumuloException | AccumuloSecurityException e) {
- fail("Error shutting down TabletServer", e);
- }
+ final String finalAddress = addressWithSession;
+ System.out.println("Attempting to shutdown TabletServer at: " +
address);
+ try {
+ ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
+ c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
+ getCluster().getServerContext().rpcCreds(), finalAddress,
false));
+ } catch (AccumuloException | AccumuloSecurityException e) {
+ fail("Error shutting down TabletServer", e);
+ }
- });
+ });
Wait.waitFor(() -> client.instanceOperations().getTabletServers().size()
== 0);
@@ -219,7 +217,8 @@ public class ManagerAssignmentIT extends
AccumuloClusterHarness {
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
- Wait.waitFor(() -> client.instanceOperations().getTabletServers().size()
== 1);
+ Wait.waitFor(() -> client.instanceOperations().getTabletServers().size()
== 1,
+ SECONDS.toMillis(60), SECONDS.toMillis(2));
client.instanceOperations().waitForBalance();
@@ -229,29 +228,28 @@ public class ManagerAssignmentIT extends
AccumuloClusterHarness {
Locations locs = client.tableOperations().locate(RootTable.NAME,
Collections.singletonList(TabletsSection.getRange()));
- locs.groupByTablet().keySet().stream().map(tid ->
locs.getTabletLocation(tid))
- .forEach(location -> {
- HostAndPort address = HostAndPort.fromString(location);
- String addressWithSession = address.toString();
- var zLockPath =
ServiceLock.path(getCluster().getServerContext().getZooKeeperRoot()
- + Constants.ZTSERVERS + "/" + address.toString());
- long sessionId =
-
ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(),
zLockPath);
- if (sessionId != 0) {
- addressWithSession = address.toString() + "[" +
Long.toHexString(sessionId) + "]";
- }
+
locs.groupByTablet().keySet().stream().map(locs::getTabletLocation).forEach(location
-> {
+ HostAndPort address = HostAndPort.fromString(location);
+ String addressWithSession = address.toString();
+ var zLockPath =
ServiceLock.path(getCluster().getServerContext().getZooKeeperRoot()
+ + Constants.ZTSERVERS + "/" + address);
+ long sessionId =
+
ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(),
zLockPath);
+ if (sessionId != 0) {
+ addressWithSession = address + "[" + Long.toHexString(sessionId) +
"]";
+ }
- final String finalAddress = addressWithSession;
- System.out.println("Attempting to shutdown TabletServer at: " +
address.toString());
- try {
- ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
- c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
- getCluster().getServerContext().rpcCreds(),
finalAddress, false));
- } catch (AccumuloException | AccumuloSecurityException e) {
- fail("Error shutting down TabletServer", e);
- }
+ final String finalAddress = addressWithSession;
+ System.out.println("Attempting to shutdown TabletServer at: " +
address);
+ try {
+ ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
+ c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
+ getCluster().getServerContext().rpcCreds(), finalAddress,
false));
+ } catch (AccumuloException | AccumuloSecurityException e) {
+ fail("Error shutting down TabletServer", e);
+ }
- });
+ });
Wait.waitFor(() -> client.instanceOperations().getTabletServers().size()
== 0);
