You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2023/06/13 19:57:31 UTC
[accumulo] branch 2.1 updated: Use flush with wait in GarbageCollector Trash tests (#3490)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 02758b8695 Use flush with wait in GarbageCollector Trash tests (#3490)
02758b8695 is described below
commit 02758b86952ece6a4eb1eceb7dac013a68ccd9c1
Author: Dave Marion <dl...@apache.org>
AuthorDate: Tue Jun 13 15:26:36 2023 -0400
Use flush with wait in GarbageCollector Trash tests (#3490)
Fixes #3487
---
.../org/apache/accumulo/test/functional/GarbageCollectorTrashBase.java | 2 +-
.../test/functional/GarbageCollectorTrashEnabledCustomPolicyIT.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashBase.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashBase.java
index e3172e2d0e..ac9c0b9476 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashBase.java
@@ -66,7 +66,7 @@ public class GarbageCollectorTrashBase extends ConfigurableMacBase {
// create some files
for (int i = 0; i < 5; i++) {
ReadWriteIT.ingest(client, 10, 10, 10, 0, tableName);
- client.tableOperations().flush(tableName);
+ client.tableOperations().flush(tableName, null, null, true);
}
return getFilesForTable(ctx, client, tableName);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledCustomPolicyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledCustomPolicyIT.java
index f2df9151a0..6331a7135c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledCustomPolicyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledCustomPolicyIT.java
@@ -91,7 +91,7 @@ public class GarbageCollectorTrashEnabledCustomPolicyIT extends GarbageCollector
super.makeTrashDir(fs);
try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) {
ReadWriteIT.ingest(c, 10, 10, 10, 0, table);
- c.tableOperations().flush(table);
+ c.tableOperations().flush(table, null, null, true);
ArrayList<StoredTabletFile> files1 = getFilesForTable(super.getServerContext(), c, table);
assertFalse(files1.isEmpty());
assertTrue(files1.stream().allMatch(stf -> stf.getPath().getName().startsWith("F")));