dlmarion commented on a change in pull request #2422: URL: https://github.com/apache/accumulo/pull/2422#discussion_r830197238
########## File path: core/src/main/java/org/apache/accumulo/core/clientImpl/ScanAttemptsImpl.java ########## @@ -0,0 +1,121 @@ +/* + * 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 + * + * http://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.core.clientImpl; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.accumulo.core.data.TabletId; +import org.apache.accumulo.core.spi.scan.ScanServerDispatcher.ScanAttempt; + +import com.google.common.collect.Collections2; +import com.google.common.collect.Maps; + +public class ScanAttemptsImpl { + + static class ScanAttemptImpl + implements org.apache.accumulo.core.spi.scan.ScanServerDispatcher.ScanAttempt { + + private final String server; + private final long time; + private final Result result; + private volatile long mutationCount = Long.MAX_VALUE; + + ScanAttemptImpl(Result result, String server, long time) { + this.result = result; + this.server = Objects.requireNonNull(server); + this.time = time; + } + + @Override + public String getServer() { + return server; + } + + @Override + public long getEndTime() { + return time; + } + + @Override + public Result getResult() { + return result; + } + + private void setMutationCount(long mc) { + this.mutationCount = mc; + } + + public long getMutationCount() { + return mutationCount; + } + + } + + private Map<TabletId,Collection<ScanAttemptImpl>> attempts = new ConcurrentHashMap<>(); + private long mutationCounter = 0; + + private AtomicInteger currentIteration = new AtomicInteger(0); Review comment: variable is not used ########## File path: test/src/main/java/org/apache/accumulo/test/ScanServerIT.java ########## @@ -0,0 +1,213 @@ +/* + * 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 + * + * http://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.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.fail; + +import java.util.Collections; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.concurrent.TimeUnit; + +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.Scanner; +import org.apache.accumulo.core.client.ScannerBase.ConsistencyLevel; +import org.apache.accumulo.core.client.TableOfflineException; +import org.apache.accumulo.core.clientImpl.ThriftScanner.ScanTimedOutException; +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.security.Authorizations; +import org.apache.accumulo.fate.zookeeper.ZooReaderWriter; +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.test.functional.ReadWriteIT; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +public class ScanServerIT extends SharedMiniClusterBase { + + private static class ScanServerITConfiguration implements MiniClusterConfigurationCallback { + + @Override + public void configureMiniCluster(MiniAccumuloConfigImpl cfg, + org.apache.hadoop.conf.Configuration coreSite) { + cfg.setNumScanServers(1); + cfg.setProperty(Property.TSERV_SESSION_MAXIDLE, "3s"); + cfg.setProperty(Property.TSERV_SCAN_EXECUTORS_DEFAULT_THREADS, "1"); + } + } + + @BeforeClass + public static void start() throws Exception { + ScanServerITConfiguration c = new ScanServerITConfiguration(); + SharedMiniClusterBase.startMiniClusterWithConfig(c); + SharedMiniClusterBase.getCluster().getClusterControl().start(ServerType.SCAN_SERVER, + "localhost"); + + String zooRoot = getCluster().getServerContext().getZooKeeperRoot(); + ZooReaderWriter zrw = getCluster().getServerContext().getZooReaderWriter(); + String scanServerRoot = zooRoot + Constants.ZSSERVERS; + + while (zrw.getChildren(scanServerRoot).size() == 0) { + Thread.sleep(500); + } + } + + @AfterClass + public static void stop() throws Exception { + SharedMiniClusterBase.stopMiniCluster(); + } + + @Test + public void testScan() throws Exception { + + try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) { + String tableName = getUniqueNames(1)[0]; + + client.tableOperations().create(tableName); + + ReadWriteIT.ingest(client, getClientInfo(), 10, 10, 50, 0, tableName); + + client.tableOperations().flush(tableName, null, null, true); + + try (Scanner scanner = client.createScanner(tableName, Authorizations.EMPTY)) { + scanner.setRange(new Range()); + scanner.setConsistencyLevel(ConsistencyLevel.EVENTUAL); + int count = 0; + for (@SuppressWarnings("unused") + Entry<Key,Value> entry : scanner) { + count++; + } + assertEquals(100, count); + } // when the scanner is closed, all open sessions should be closed + } + } + + @Test + public void testBatchScan() throws Exception { + + try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) { + String tableName = getUniqueNames(1)[0]; + + client.tableOperations().create(tableName); + + ReadWriteIT.ingest(client, getClientInfo(), 10, 10, 50, 0, tableName); + + client.tableOperations().flush(tableName, null, null, true); + + try (BatchScanner scanner = client.createBatchScanner(tableName, Authorizations.EMPTY)) { + scanner.setRanges(Collections.singletonList(new Range())); + scanner.setConsistencyLevel(ConsistencyLevel.EVENTUAL); + int count = 0; + for (@SuppressWarnings("unused") + Entry<Key,Value> entry : scanner) { + count++; + } + assertEquals(100, count); + } // when the scanner is closed, all open sessions should be closed + } + } + + // TODO: This test currently fails, but we could change the client code to make it work. + @Test + public void testScanOfflineTable() throws Exception { + try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) { + String tableName = getUniqueNames(1)[0]; + + client.tableOperations().create(tableName); + + ReadWriteIT.ingest(client, getClientInfo(), 10, 10, 50, 0, tableName); + + client.tableOperations().flush(tableName, null, null, true); + client.tableOperations().offline(tableName, true); + + assertThrows(TableOfflineException.class, () -> { + try (Scanner scanner = client.createScanner(tableName, Authorizations.EMPTY)) { + scanner.setRange(new Range()); + scanner.setConsistencyLevel(ConsistencyLevel.EVENTUAL); + int count = 0; + for (@SuppressWarnings("unused") + Entry<Key,Value> entry : scanner) { + count++; + } + assertEquals(100, count); + } // when the scanner is closed, all open sessions should be closed + }); + } + } + + @Test + public void testScanServerBusy() throws Exception { + try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) { + String tableName = getUniqueNames(1)[0]; + + client.tableOperations().create(tableName); + + ReadWriteIT.ingest(client, getClientInfo(), 10, 10, 50, 0, tableName); + + client.tableOperations().flush(tableName, null, null, true); + + Scanner scanner = client.createScanner(tableName, Authorizations.EMPTY); + scanner.setRange(new Range()); + scanner.setConsistencyLevel(ConsistencyLevel.EVENTUAL); + // We only inserted 100 rows, default batch size is 1000. If we don't set the + // batch size lower, then the server side code will automatically close the + // scanner on the first call to continueScan. We want to keep it open, so lower the batch + // size. + scanner.setBatchSize(10); + Iterator<Entry<Key,Value>> iter = scanner.iterator(); + iter.next(); + iter.next(); + // At this point the tablet server will time out this scan after TSERV_SESSION_MAXIDLE + // Start up another scanner and set it to time out in 1s. It should fail because there + // is no scan server available to run the scan. + Scanner scanner2 = client.createScanner(tableName, Authorizations.EMPTY); + scanner2.setRange(new Range()); + scanner2.setConsistencyLevel(ConsistencyLevel.EVENTUAL); + scanner2.setTimeout(1, TimeUnit.SECONDS); + Iterator<Entry<Key,Value>> iter2 = scanner2.iterator(); + try { + iter2.hasNext(); + assertNotNull(iter2.next()); + fail("Expecting ScanTimedOutException"); Review comment: This is the only test failing. This test starts one scanner, and then starts another, expecting an exception to occur because TSERV_SCAN_EXECUTORS_DEFAULT_THREADS is set to 1 in the MAC config above. An exception is not thrown. @keith-turner - what's the expected behavior 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]
