keith-turner commented on code in PR #3436: URL: https://github.com/apache/accumulo/pull/3436#discussion_r1210553664
########## test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledIT.java: ########## @@ -0,0 +1,84 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.fs.FileSystem; +import org.junit.jupiter.api.Test; + +public class GarbageCollectorTrashEnabledIT extends GarbageCollectorTrashBase { + + @Override + protected Duration defaultTimeout() { + return Duration.ofMinutes(5); + } + + @Override + public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { + + Map<String,String> hadoopOverrides = new HashMap<>(); + hadoopOverrides.put(CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_KEY, "5"); + cfg.setHadoopConfOverrides(hadoopOverrides); + cfg.useMiniDFS(true); + + cfg.setProperty(Property.GC_CYCLE_START, "1"); + cfg.setProperty(Property.GC_CYCLE_DELAY, "1"); + @SuppressWarnings("removal") + Property p = Property.GC_TRASH_IGNORE; + cfg.setProperty(p, "false"); // default, use trash if configured + cfg.setProperty(Property.GC_PORT, "0"); + cfg.setProperty(Property.TSERV_MAXMEM, "5K"); + cfg.setProperty(Property.TABLE_MAJC_RATIO, "5.0"); + cfg.setProperty(Property.TSERV_MAJC_DELAY, "180s"); + } + + @Test + public void testTrashHadoopEnabledAccumuloEnabled() throws Exception { + String table = this.getUniqueNames(1)[0]; + final FileSystem fs = super.getCluster().getFileSystem(); + super.makeTrashDir(fs); + ArrayList<StoredTabletFile> files = null; + TableId tid = null; + try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) { + files = super.loadData(super.getServerContext(), c, table); + assertFalse(files.isEmpty()); + c.tableOperations().compact(table, new CompactionConfig()); + tid = TableId.of(c.tableOperations().tableIdMap().get(table)); + } + Thread.sleep(10000); + assertEquals(files.size(), super.countFilesInTrash(fs, tid)); Review Comment: This could loop waiting for the condition to be true. ########## test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDisabledIT.java: ########## @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.fs.FileSystem; +import org.junit.jupiter.api.Test; + +public class GarbageCollectorTrashDisabledIT extends GarbageCollectorTrashBase { + + @Override + protected Duration defaultTimeout() { + return Duration.ofMinutes(5); + } + + @Override + public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { + + Map<String,String> hadoopOverrides = new HashMap<>(); + hadoopOverrides.put(CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_KEY, "5"); + cfg.setHadoopConfOverrides(hadoopOverrides); + cfg.useMiniDFS(true); + + cfg.setProperty(Property.GC_CYCLE_START, "1"); + cfg.setProperty(Property.GC_CYCLE_DELAY, "1"); + @SuppressWarnings("removal") + Property p = Property.GC_TRASH_IGNORE; + cfg.setProperty(p, "true"); // don't use trash if configured + cfg.setProperty(Property.GC_PORT, "0"); + cfg.setProperty(Property.TSERV_MAXMEM, "5K"); + cfg.setProperty(Property.TABLE_MAJC_RATIO, "5.0"); + cfg.setProperty(Property.TSERV_MAJC_DELAY, "180s"); + } + + @Test + public void testTrashHadoopEnabledAccumuloDisabled() throws Exception { + String table = this.getUniqueNames(1)[0]; + final FileSystem fs = super.getCluster().getFileSystem(); + super.makeTrashDir(fs); + ArrayList<StoredTabletFile> files = null; + TableId tid = null; + try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) { + files = super.loadData(super.getServerContext(), c, table); + assertFalse(files.isEmpty()); + c.tableOperations().compact(table, new CompactionConfig()); + tid = TableId.of(c.tableOperations().tableIdMap().get(table)); + } + Thread.sleep(10000); Review Comment: Could wait for compaction and then GC (by waiting for the files to be deleted in orig location) here also instead of sleeping. Could put a new method in the parent class that waits for files to be gone from a table. ########## test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledIT.java: ########## @@ -0,0 +1,84 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.fs.FileSystem; +import org.junit.jupiter.api.Test; + +public class GarbageCollectorTrashEnabledIT extends GarbageCollectorTrashBase { + + @Override + protected Duration defaultTimeout() { + return Duration.ofMinutes(5); + } + + @Override + public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { + + Map<String,String> hadoopOverrides = new HashMap<>(); + hadoopOverrides.put(CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_KEY, "5"); + cfg.setHadoopConfOverrides(hadoopOverrides); + cfg.useMiniDFS(true); + + cfg.setProperty(Property.GC_CYCLE_START, "1"); + cfg.setProperty(Property.GC_CYCLE_DELAY, "1"); + @SuppressWarnings("removal") + Property p = Property.GC_TRASH_IGNORE; + cfg.setProperty(p, "false"); // default, use trash if configured + cfg.setProperty(Property.GC_PORT, "0"); + cfg.setProperty(Property.TSERV_MAXMEM, "5K"); + cfg.setProperty(Property.TABLE_MAJC_RATIO, "5.0"); + cfg.setProperty(Property.TSERV_MAJC_DELAY, "180s"); + } + + @Test + public void testTrashHadoopEnabledAccumuloEnabled() throws Exception { + String table = this.getUniqueNames(1)[0]; + final FileSystem fs = super.getCluster().getFileSystem(); + super.makeTrashDir(fs); + ArrayList<StoredTabletFile> files = null; + TableId tid = null; + try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) { + files = super.loadData(super.getServerContext(), c, table); + assertFalse(files.isEmpty()); + c.tableOperations().compact(table, new CompactionConfig()); Review Comment: Could wait for the compaction to finish ```suggestion c.tableOperations().compact(table, new CompactionConfig().setWait(true)); ``` ########## test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDefaultIT.java: ########## @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.time.Duration; +import java.util.ArrayList; + +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.junit.jupiter.api.Test; + +public class GarbageCollectorTrashDefaultIT extends GarbageCollectorTrashBase { + + @Override + protected Duration defaultTimeout() { + return Duration.ofMinutes(5); + } + + @Override + public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { + // By default Hadoop trash is disabled - fs.trash.interval defaults to 0 Review Comment: Could explicitly set this to zero in the test even thought its the default. ########## test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledCustomPolicyIT.java: ########## @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.io.IOException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.TrashPolicyDefault; +import org.junit.jupiter.api.Test; + +public class GarbageCollectorTrashEnabledCustomPolicyIT extends GarbageCollectorTrashBase { + + public static class NoFlushFilesInTrashPolicy extends TrashPolicyDefault { + + @Override + public boolean moveToTrash(Path path) throws IOException { + // Don't put flush files in the Trash + if (!path.getName().startsWith("F")) { + return super.moveToTrash(path); + } + return false; + } + + } + + @Override + protected Duration defaultTimeout() { + return Duration.ofMinutes(5); + } + + @Override + public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { + + Map<String,String> hadoopOverrides = new HashMap<>(); + hadoopOverrides.put(CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_KEY, "5"); + hadoopOverrides.put("fs.trash.classname", NoFlushFilesInTrashPolicy.class.getName()); + cfg.setHadoopConfOverrides(hadoopOverrides); + cfg.useMiniDFS(true); + + cfg.setProperty(Property.GC_CYCLE_START, "1"); + cfg.setProperty(Property.GC_CYCLE_DELAY, "1"); + @SuppressWarnings("removal") + Property p = Property.GC_TRASH_IGNORE; + cfg.setProperty(p, "false"); // default, use trash if configured + cfg.setProperty(Property.GC_PORT, "0"); + cfg.setProperty(Property.TSERV_MAXMEM, "5K"); + cfg.setProperty(Property.TABLE_MAJC_RATIO, "5.0"); + cfg.setProperty(Property.TSERV_MAJC_DELAY, "180s"); + } + + @Test + public void testTrashHadoopEnabledAccumuloEnabled() throws Exception { + String table = this.getUniqueNames(1)[0]; + final FileSystem fs = super.getCluster().getFileSystem(); + super.makeTrashDir(fs); + ArrayList<StoredTabletFile> files = null; + TableId tid = null; + try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) { + files = super.loadData(super.getServerContext(), c, table); + assertFalse(files.isEmpty()); + c.tableOperations().compact(table, new CompactionConfig()); + tid = TableId.of(c.tableOperations().tableIdMap().get(table)); + } + Thread.sleep(10000); Review Comment: Could make this wait until the flush files in the original location are gone/GCed and then count the files in trash instead of sleeping. ########## test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDefaultIT.java: ########## @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import java.time.Duration; +import java.util.ArrayList; + +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.junit.jupiter.api.Test; + +public class GarbageCollectorTrashDefaultIT extends GarbageCollectorTrashBase { + + @Override + protected Duration defaultTimeout() { + return Duration.ofMinutes(5); + } + + @Override + public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { + // By default Hadoop trash is disabled - fs.trash.interval defaults to 0 + cfg.useMiniDFS(true); + + cfg.setProperty(Property.GC_CYCLE_START, "1"); + cfg.setProperty(Property.GC_CYCLE_DELAY, "1"); + @SuppressWarnings("removal") + Property p = Property.GC_TRASH_IGNORE; + cfg.setProperty(p, "false"); // default, use trash if configured + cfg.setProperty(Property.GC_PORT, "0"); + cfg.setProperty(Property.TSERV_MAXMEM, "5K"); + cfg.setProperty(Property.TABLE_MAJC_RATIO, "5.0"); + cfg.setProperty(Property.TSERV_MAJC_DELAY, "1"); + } + + @Test + public void testTrashHadoopDisabledAccumuloEnabled() throws Exception { + String table = this.getUniqueNames(1)[0]; + final FileSystem fs = super.getCluster().getFileSystem(); + super.makeTrashDir(fs); + TableId tid = null; + try (AccumuloClient c = Accumulo.newClient().from(getClientProperties()).build()) { + ArrayList<StoredTabletFile> files = super.loadData(super.getServerContext(), c, table); + assertFalse(files.isEmpty()); + c.tableOperations().compact(table, new CompactionConfig()); + tid = TableId.of(c.tableOperations().tableIdMap().get(table)); + } + + // The default value for fs.trash.interval is 0, which means that + // trash is disabled in the Hadoop configuration. Enabling trash in + // Accumulo (GC_TRASH_IGNORE = false) still requires enabling trash in Hadoop + Thread.sleep(10000); Review Comment: could also wait for compaction and files to be gone here. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
