This is an automated email from the ASF dual-hosted git repository.
kturner 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 cc9515988e adds test to cover deleting unsplittable col in split code
(#4794)
cc9515988e is described below
commit cc9515988ea27a873b1f386e7e55dbcba92a3962
Author: Keith Turner <[email protected]>
AuthorDate: Fri Aug 9 12:57:49 2024 -0400
adds test to cover deleting unsplittable col in split code (#4794)
The new test in this commit covers the following code
https://github.com/apache/accumulo/blob/d1456fcaa440f94b03e2a7e7f557fb77f8ef2426/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/FindSplits.java#L142-L148
---
.../org/apache/accumulo/test/LargeSplitRowIT.java | 8 ++-
.../apache/accumulo/test/fate/ManagerRepoIT.java | 68 +++++++++++++++++++++-
2 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
index b810707cba..a2a304a5f2 100644
--- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
@@ -51,6 +51,7 @@ import
org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.split.SplitUtils;
+import org.apache.accumulo.test.fate.ManagerRepoIT;
import org.apache.accumulo.test.functional.ConfigurableMacBase;
import org.apache.accumulo.test.util.Wait;
import org.apache.hadoop.conf.Configuration;
@@ -345,8 +346,11 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
}
}
- // Test the unsplittable column is cleaned up if a previously marked
unsplittable tablet
- // no longer needs to be split
+ /**
+ * Test the unsplittable column is cleaned up if a previously marked
unsplittable tablet /* no
+ * longer needs to be split. The test {@link
ManagerRepoIT#testFindSplitsDeleteUnsplittable()} is
+ * similar to this test.
+ */
@Test
@Timeout(60)
public void testUnsplittableCleanup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
index e49de2fa9f..50ee816e86 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
@@ -18,7 +18,10 @@
*/
package org.apache.accumulo.test.fate;
+import static
org.apache.accumulo.core.client.ConditionalWriter.Status.ACCEPTED;
+import static org.apache.accumulo.core.client.ConditionalWriter.Status.UNKNOWN;
import static org.apache.accumulo.test.ample.TestAmpleUtil.mockWithAmple;
+import static
org.apache.accumulo.test.ample.metadata.ConditionalWriterInterceptor.withStatus;
import static org.apache.accumulo.test.ample.metadata.TestAmple.not;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -62,6 +65,7 @@ import
org.apache.accumulo.manager.tableOps.split.AllocateDirsAndEnsureOnline;
import org.apache.accumulo.manager.tableOps.split.FindSplits;
import org.apache.accumulo.manager.tableOps.split.PreSplit;
import org.apache.accumulo.manager.tableOps.split.SplitInfo;
+import org.apache.accumulo.test.LargeSplitRowIT;
import org.apache.accumulo.test.ample.metadata.TestAmple;
import org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl;
import org.apache.hadoop.io.Text;
@@ -203,8 +207,9 @@ public class ManagerRepoIT extends SharedMiniClusterBase {
TableId tableId =
TableId.of(client.tableOperations().tableIdMap().get(userTable));
- TestServerAmpleImpl testAmple = (TestServerAmpleImpl) TestAmple
- .create(getCluster().getServerContext(), Map.of(DataLevel.USER,
metadataTable));
+ TestServerAmpleImpl testAmple =
+ (TestServerAmpleImpl)
TestAmple.create(getCluster().getServerContext(),
+ Map.of(DataLevel.USER, metadataTable), () ->
withStatus(ACCEPTED, UNKNOWN, 1));
// Prevent UNSPLITTABLE_COLUMN just in case a system split tried to run
on the table
// before we copied it and inserted the column
testAmple.createMetadataFromExisting(client, tableId,
@@ -243,6 +248,65 @@ public class ManagerRepoIT extends SharedMiniClusterBase {
}
}
+ /**
+ * The test {@link LargeSplitRowIT#testUnsplittableCleanup()} is similar to
this test.
+ */
+ @Test
+ public void testFindSplitsDeleteUnsplittable() throws Exception {
+
+ String[] tableNames = getUniqueNames(2);
+ String metadataTable = tableNames[0];
+ String userTable = tableNames[1];
+
+ try (ClientContext client =
+ (ClientContext) Accumulo.newClient().from(getClientProps()).build()) {
+ TestAmple.createMetadataTable(client, metadataTable);
+
+ // Create table with a smaller max end row size
+ createUnsplittableTable(client, userTable);
+ populateUnsplittableTable(client, userTable);
+
+ TableId tableId =
TableId.of(client.tableOperations().tableIdMap().get(userTable));
+
+ TestServerAmpleImpl testAmple =
+ (TestServerAmpleImpl)
TestAmple.create(getCluster().getServerContext(),
+ Map.of(DataLevel.USER, metadataTable), () ->
withStatus(ACCEPTED, UNKNOWN, 1));
+ // Prevent UNSPLITTABLE_COLUMN just in case a system split tried to run
on the table
+ // before we copied it and inserted the column
+ testAmple.createMetadataFromExisting(client, tableId,
+ not(SplitColumnFamily.UNSPLITTABLE_COLUMN));
+
+ KeyExtent extent = new KeyExtent(tableId, null, null);
+ Manager manager = mockWithAmple(getCluster().getServerContext(),
testAmple);
+
+ FindSplits findSplits = new FindSplits(extent);
+ PreSplit preSplit = (PreSplit) findSplits
+ .call(FateId.from(FateInstanceType.USER, UUID.randomUUID()),
manager);
+
+ // The table should not need splitting
+ assertNull(preSplit);
+
+ // Verify metadata has unsplittable column
+ var metadata = testAmple.readTablet(new KeyExtent(tableId, null,
null)).getUnSplittable();
+ assertNotNull(metadata);
+
+ // Increase the split threshold such that the tablet no longer needs to
split. This will also
+ // make the config differ from what is in the unsplittable column.
+ client.tableOperations().setProperty(userTable,
Property.TABLE_SPLIT_THRESHOLD.getKey(),
+ "1M");
+
+ findSplits = new FindSplits(extent);
+ preSplit = (PreSplit) findSplits.call(FateId.from(FateInstanceType.USER,
UUID.randomUUID()),
+ manager);
+
+ // The table SHOULD not need splitting
+ assertNull(preSplit);
+
+ // The tablet no longer needs to split so the unsplittable column should
have been deleted
+ assertNull(testAmple.readTablet(new KeyExtent(tableId, null,
null)).getUnSplittable());
+ }
+ }
+
private void createUnsplittableTable(ClientContext client, String table)
throws Exception {
// make a table and lower the configuration properties
// @formatter:off
