keith-turner commented on code in PR #4615: URL: https://github.com/apache/accumulo/pull/4615#discussion_r1621347160
########## test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java: ########## @@ -0,0 +1,137 @@ +/* + * 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; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Collections; +import java.util.Iterator; +import java.util.Map.Entry; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.Accumulo; +import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.core.client.BatchScanner; +import org.apache.accumulo.core.client.ScannerBase.ConsistencyLevel; +import org.apache.accumulo.core.clientImpl.ClientContext; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.spi.scan.ScanServerSelector; +import org.apache.accumulo.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.util.Wait; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +public class ScanServerShutdownIT extends SharedMiniClusterBase { + + private static class ScanServerShutdownITConfiguration + implements MiniClusterConfigurationCallback { + + @Override + public void configureMiniCluster(MiniAccumuloConfigImpl cfg, + org.apache.hadoop.conf.Configuration coreSite) { + cfg.setNumScanServers(1); + + // Timeout scan sessions after being idle for 3 seconds + cfg.setProperty(Property.TSERV_SESSION_MAXIDLE, "3s"); + + // Configure the scan server to only have 1 scan executor thread. This means + // that the scan server will run scans serially, not concurrently. + cfg.setProperty(Property.SSERV_SCAN_EXECUTORS_DEFAULT_THREADS, "1"); + } + } + + @BeforeAll + public static void start() throws Exception { + ScanServerShutdownITConfiguration c = new ScanServerShutdownITConfiguration(); + SharedMiniClusterBase.startMiniClusterWithConfig(c); + } + + @AfterAll + public static void stop() throws Exception { + SharedMiniClusterBase.stopMiniCluster(); + } + + @Test + public void testRefRemovalOnShutdown() throws Exception { + + ServerContext ctx = getCluster().getServerContext(); + String zooRoot = ctx.getZooKeeperRoot(); + ZooReaderWriter zrw = ctx.getZooReaderWriter(); + String scanServerRoot = zooRoot + Constants.ZSSERVERS; + + Wait.waitFor(() -> zrw.getChildren(scanServerRoot).size() == 0); + + // Stop normal ScanServers so that we can start our custom implementation + // that shuts down after 3 batch scans + getCluster().getClusterControl().startScanServer(SelfStoppingScanServer.class, 1, + ScanServerSelector.DEFAULT_SCAN_SERVER_GROUP_NAME); + + // Wait for the ScanServer to register in ZK + Wait.waitFor(() -> zrw.getChildren(scanServerRoot).size() == 1); + + try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) { + final String tableName = getUniqueNames(1)[0]; + + client.tableOperations().create(tableName); + + // Make multiple files + final int fileCount = 3; + for (int i = 0; i < fileCount; i++) { + ScanServerIT.ingest(client, tableName, 10, 10, 0, "colf", true); + } + + for (int i = 0; i < 3; i++) { Review Comment: Yeah the check on line 120 is sufficient, I missed that. I think I glossed over that code block assuming it was just scanning. -- 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]
