Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BDAD10A6B for ; Tue, 23 Jul 2013 16:54:48 +0000 (UTC) Received: (qmail 53359 invoked by uid 500); 23 Jul 2013 16:54:36 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 52781 invoked by uid 500); 23 Jul 2013 16:54:32 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 51774 invoked by uid 99); 23 Jul 2013 16:54:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jul 2013 16:54:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4CC528B2147; Tue, 23 Jul 2013 16:54:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Tue, 23 Jul 2013 16:54:44 -0000 Message-Id: <6d6afa5b1c9e47ff8c6617e1c74e0e58@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/50] git commit: ACCUMULO-1572 integration test ACCUMULO-1572 integration test Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/388d58c6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/388d58c6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/388d58c6 Branch: refs/heads/ACCUMULO-1000 Commit: 388d58c6d02224e76fab77db852258eccc2dab7a Parents: 5cfb88b Author: Eric Newton Authored: Wed Jul 17 14:12:28 2013 -0400 Committer: Eric Newton Committed: Wed Jul 17 14:12:28 2013 -0400 ---------------------------------------------------------------------- .../test/functional/ZookeeperRestartIT.java | 81 ++++++++++++++++++++ 1 file changed, 81 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/388d58c6/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java new file mode 100644 index 0000000..f718a63 --- /dev/null +++ b/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.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 + * + * 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.functional; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Mutation; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.ProcessReference; +import org.apache.accumulo.minicluster.ServerType; +import org.junit.Test; + +public class ZookeeperRestartIT extends MacTest { + + @Override + public void configure(MiniAccumuloConfig cfg) { + Map siteConfig = new HashMap(); + siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "3s"); + cfg.setSiteConfig(siteConfig); + } + + @Test(timeout = 20 * 1000) + public void test() throws Exception { + Connector c = getConnector(); + c.tableOperations().create("test_ingest"); + BatchWriter bw = c.createBatchWriter("test_ingest", null); + Mutation m = new Mutation("row"); + m.put("cf", "cq", "value"); + bw.addMutation(m); + bw.close(); + + // kill zookeeper + for (ProcessReference proc : cluster.getProcesses().get(ServerType.ZOOKEEPER)) + cluster.killProcess(ServerType.ZOOKEEPER, proc); + + // give the servers time to react + UtilWaitThread.sleep(1000); + + // start zookeeper back up + cluster.start(); + + // use the tservers + Scanner s = c.createScanner("test_ingest", Authorizations.EMPTY); + Iterator> i = s.iterator(); + assertTrue(i.hasNext()); + assertEquals("row", i.next().getKey().getRow().toString()); + assertFalse(i.hasNext()); + // use the master + c.tableOperations().delete("test_ingest"); + } + +}