You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/09/12 00:48:19 UTC
[1/3] git commit: ACCUMULO-3112 Nuke the test,
it's really not worthwhile.
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 7f329a9c4 -> 8a1389211
refs/heads/master e3b0412e1 -> c196a267c
ACCUMULO-3112 Nuke the test, it's really not worthwhile.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a138921
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8a138921
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8a138921
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 8a1389211bdfbbbc3fc5e42404630f0dbaaeee9d
Parents: 7f329a9
Author: Josh Elser <el...@apache.org>
Authored: Thu Sep 11 15:47:39 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu Sep 11 15:47:39 2014 -0700
----------------------------------------------------------------------
.../impl/MiniAccumuloClusterGCTest.java | 151 -------------------
1 file changed, 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a138921/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java
deleted file mode 100644
index 8656835..0000000
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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.minicluster.impl;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.minicluster.ServerType;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.SuffixFileFilter;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.log4j.Logger;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- *
- */
-public class MiniAccumuloClusterGCTest {
- private static final Logger log = Logger.getLogger(MiniAccumuloClusterGCTest.class);
- private static File testDir = new File(System.getProperty("user.dir") + "/target/" + MiniAccumuloClusterGCTest.class.getName());
- private static MiniAccumuloConfigImpl macConfig;
- private static MiniAccumuloClusterImpl accumulo;
- private static final String passwd = "password";
-
- @BeforeClass
- public static void setupMiniCluster() throws Exception {
- FileUtils.deleteQuietly(testDir);
- testDir.mkdir();
-
- macConfig = new MiniAccumuloConfigImpl(testDir, passwd);
- macConfig.setNumTservers(1);
-
- // And tweak the settings to make it run often
- Map<String,String> config = ImmutableMap.of(Property.GC_CYCLE_DELAY.getKey(), "1s", Property.GC_CYCLE_START.getKey(), "0s");
- macConfig.setSiteConfig(config);
-
- accumulo = new MiniAccumuloClusterImpl(macConfig);
- accumulo.start();
- }
-
- @AfterClass
- public static void tearDownMiniCluster() throws Exception {
- accumulo.stop();
- }
-
- // This test seems to be a little too unstable for a unit test
- @Ignore
- public void test() throws Exception {
- ZooKeeperInstance inst = new ZooKeeperInstance(accumulo.getClientConfig());
- Connector c = inst.getConnector("root", new PasswordToken(passwd));
-
- final String table = "foobar";
- c.tableOperations().create(table);
-
- final String tableId = c.tableOperations().tableIdMap().get(table);
-
- BatchWriter bw = null;
-
- // Add some data
- try {
- bw = c.createBatchWriter(table, new BatchWriterConfig().setMaxMemory(100000l).setMaxLatency(100, TimeUnit.MILLISECONDS).setMaxWriteThreads(1));
- Mutation m = new Mutation("a");
- for (int i = 0; i < 500; i++) {
- m.put("colf", Integer.toString(i), "");
- }
-
- bw.addMutation(m);
- } finally {
- if (null != bw) {
- bw.close();
- }
- }
-
- File accumuloDir = new File(testDir, "accumulo");
- File tables = new File(accumuloDir.getAbsolutePath(), "tables");
- File myTable = new File(tables, tableId);
-
- log.trace("Files before compaction: " + FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE));
-
- final boolean flush = true, wait = true;
-
- // Compact the tables to get some rfiles which we can gc
- c.tableOperations().compact(table, null, null, flush, wait);
-
- Collection<File> filesAfterCompaction = FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE);
- int fileCountAfterCompaction = filesAfterCompaction.size();
-
- log.trace("Files after compaction: " + filesAfterCompaction);
-
- // Sleep for 10s to let the GC do its thing
- for (int i = 1; i < 10; i++) {
- Thread.sleep(1000);
- filesAfterCompaction = FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE);
-
- log.trace("Files in loop: " + filesAfterCompaction);
-
- int fileCountAfterGCWait = filesAfterCompaction.size();
-
- if (fileCountAfterGCWait < fileCountAfterCompaction) {
- return;
- }
- }
-
- Assert.fail("Expected to find less files after compaction and pause for GC");
- }
-
- @Test(timeout = 10000)
- public void testAccurateProcessListReturned() throws Exception {
- Map<ServerType,Collection<ProcessReference>> procs = accumulo.getProcesses();
-
- for (ServerType t : new ServerType[] {ServerType.MASTER, ServerType.TABLET_SERVER, ServerType.ZOOKEEPER, ServerType.GARBAGE_COLLECTOR}) {
- Assert.assertTrue(procs.containsKey(t));
- Collection<ProcessReference> procRefs = procs.get(t);
- Assert.assertTrue(1 <= procRefs.size());
-
- for (ProcessReference procRef : procRefs) {
- Assert.assertNotNull(procRef);
- }
- }
- }
-
-}
[2/3] git commit: ACCUMULO-3112 Nuke the test,
it's really not worthwhile.
Posted by el...@apache.org.
ACCUMULO-3112 Nuke the test, it's really not worthwhile.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a138921
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8a138921
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8a138921
Branch: refs/heads/master
Commit: 8a1389211bdfbbbc3fc5e42404630f0dbaaeee9d
Parents: 7f329a9
Author: Josh Elser <el...@apache.org>
Authored: Thu Sep 11 15:47:39 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu Sep 11 15:47:39 2014 -0700
----------------------------------------------------------------------
.../impl/MiniAccumuloClusterGCTest.java | 151 -------------------
1 file changed, 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a138921/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java
deleted file mode 100644
index 8656835..0000000
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterGCTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * 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.minicluster.impl;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.BatchWriterConfig;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.minicluster.ServerType;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.SuffixFileFilter;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.log4j.Logger;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- *
- */
-public class MiniAccumuloClusterGCTest {
- private static final Logger log = Logger.getLogger(MiniAccumuloClusterGCTest.class);
- private static File testDir = new File(System.getProperty("user.dir") + "/target/" + MiniAccumuloClusterGCTest.class.getName());
- private static MiniAccumuloConfigImpl macConfig;
- private static MiniAccumuloClusterImpl accumulo;
- private static final String passwd = "password";
-
- @BeforeClass
- public static void setupMiniCluster() throws Exception {
- FileUtils.deleteQuietly(testDir);
- testDir.mkdir();
-
- macConfig = new MiniAccumuloConfigImpl(testDir, passwd);
- macConfig.setNumTservers(1);
-
- // And tweak the settings to make it run often
- Map<String,String> config = ImmutableMap.of(Property.GC_CYCLE_DELAY.getKey(), "1s", Property.GC_CYCLE_START.getKey(), "0s");
- macConfig.setSiteConfig(config);
-
- accumulo = new MiniAccumuloClusterImpl(macConfig);
- accumulo.start();
- }
-
- @AfterClass
- public static void tearDownMiniCluster() throws Exception {
- accumulo.stop();
- }
-
- // This test seems to be a little too unstable for a unit test
- @Ignore
- public void test() throws Exception {
- ZooKeeperInstance inst = new ZooKeeperInstance(accumulo.getClientConfig());
- Connector c = inst.getConnector("root", new PasswordToken(passwd));
-
- final String table = "foobar";
- c.tableOperations().create(table);
-
- final String tableId = c.tableOperations().tableIdMap().get(table);
-
- BatchWriter bw = null;
-
- // Add some data
- try {
- bw = c.createBatchWriter(table, new BatchWriterConfig().setMaxMemory(100000l).setMaxLatency(100, TimeUnit.MILLISECONDS).setMaxWriteThreads(1));
- Mutation m = new Mutation("a");
- for (int i = 0; i < 500; i++) {
- m.put("colf", Integer.toString(i), "");
- }
-
- bw.addMutation(m);
- } finally {
- if (null != bw) {
- bw.close();
- }
- }
-
- File accumuloDir = new File(testDir, "accumulo");
- File tables = new File(accumuloDir.getAbsolutePath(), "tables");
- File myTable = new File(tables, tableId);
-
- log.trace("Files before compaction: " + FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE));
-
- final boolean flush = true, wait = true;
-
- // Compact the tables to get some rfiles which we can gc
- c.tableOperations().compact(table, null, null, flush, wait);
-
- Collection<File> filesAfterCompaction = FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE);
- int fileCountAfterCompaction = filesAfterCompaction.size();
-
- log.trace("Files after compaction: " + filesAfterCompaction);
-
- // Sleep for 10s to let the GC do its thing
- for (int i = 1; i < 10; i++) {
- Thread.sleep(1000);
- filesAfterCompaction = FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE);
-
- log.trace("Files in loop: " + filesAfterCompaction);
-
- int fileCountAfterGCWait = filesAfterCompaction.size();
-
- if (fileCountAfterGCWait < fileCountAfterCompaction) {
- return;
- }
- }
-
- Assert.fail("Expected to find less files after compaction and pause for GC");
- }
-
- @Test(timeout = 10000)
- public void testAccurateProcessListReturned() throws Exception {
- Map<ServerType,Collection<ProcessReference>> procs = accumulo.getProcesses();
-
- for (ServerType t : new ServerType[] {ServerType.MASTER, ServerType.TABLET_SERVER, ServerType.ZOOKEEPER, ServerType.GARBAGE_COLLECTOR}) {
- Assert.assertTrue(procs.containsKey(t));
- Collection<ProcessReference> procRefs = procs.get(t);
- Assert.assertTrue(1 <= procRefs.size());
-
- for (ProcessReference procRef : procRefs) {
- Assert.assertNotNull(procRef);
- }
- }
- }
-
-}
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c196a267
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c196a267
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c196a267
Branch: refs/heads/master
Commit: c196a267cf439579c19a77e77f4b38faa82db5a6
Parents: e3b0412 8a13892
Author: Josh Elser <el...@apache.org>
Authored: Thu Sep 11 15:48:06 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu Sep 11 15:48:06 2014 -0700
----------------------------------------------------------------------
.../impl/MiniAccumuloClusterGCTest.java | 151 -------------------
1 file changed, 151 deletions(-)
----------------------------------------------------------------------