You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/12/18 21:54:07 UTC
[01/16] accumulo git commit: ACCUMULO-2381 Remove dangerous,
broken utility
Repository: accumulo
Updated Branches:
refs/heads/1.5 c41b6dc05 -> 1f8b668f0
refs/heads/1.6 76e7fffc6 -> 8f852e2ef
refs/heads/master d1af19d50 -> aa73e7f45
ACCUMULO-2381 Remove dangerous, broken utility
Removes AddFilesWithMissingEntries utility, which does not support volumes,
does not properly work with the root table, assumes the list of files fit in
RAM, and does not satisfy a clear recovery use case for re-integrating
abandoned files into the metadata table.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af957f9c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af957f9c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af957f9c
Branch: refs/heads/1.6
Commit: af957f9cc76c7df93c7a61c2dd7f6ceff0aa1f3e
Parents: 76e7fff
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:16:07 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:16:07 2014 -0500
----------------------------------------------------------------------
.../server/util/AddFilesWithMissingEntries.java | 137 -------------------
1 file changed, 137 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af957f9c/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java b/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
deleted file mode 100644
index 198b2d6..0000000
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
+++ /dev/null
@@ -1,137 +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.server.util;
-
-import static com.google.common.base.Charsets.UTF_8;
-
-import java.util.HashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.client.MultiTableBatchWriter;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.metadata.MetadataTable;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.server.ServerConstants;
-import org.apache.accumulo.server.cli.ClientOpts;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
-
-import com.beust.jcommander.Parameter;
-
-public class AddFilesWithMissingEntries {
-
- static final Logger log = Logger.getLogger(AddFilesWithMissingEntries.class);
-
- public static class Opts extends ClientOpts {
- @Parameter(names = "-update", description = "Make changes to the " + MetadataTable.NAME + " table to include missing files")
- boolean update = false;
- }
-
- /**
- * A utility to add files to the {@value MetadataTable#NAME} table that are not listed in the root tablet. This is a recovery tool for someone who knows what
- * they are doing. It might be better to save off files, and recover your instance by re-initializing and importing the existing files.
- */
- public static void main(String[] args) throws Exception {
- Opts opts = new Opts();
- BatchWriterOpts bwOpts = new BatchWriterOpts();
- opts.parseArgs(AddFilesWithMissingEntries.class.getName(), args, bwOpts);
-
- final Scanner scanner = opts.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- scanner.setRange(MetadataSchema.TabletsSection.getRange());
- final Configuration conf = new Configuration();
- final FileSystem fs = FileSystem.get(conf);
-
- KeyExtent last = new KeyExtent();
- String directory = null;
- Set<String> knownFiles = new HashSet<String>();
-
- int count = 0;
- final MultiTableBatchWriter writer = opts.getConnector().createMultiTableBatchWriter(bwOpts.getBatchWriterConfig());
-
- // collect the list of known files and the directory for each extent
- for (Entry<Key,Value> entry : scanner) {
- Key key = entry.getKey();
- KeyExtent ke = new KeyExtent(key.getRow(), (Text) null);
- // when the key extent changes
- if (!ke.equals(last)) {
- if (directory != null) {
- // add any files in the directory unknown to the key extent
- count += addUnknownFiles(fs, directory, knownFiles, last, writer, opts.update);
- }
- directory = null;
- knownFiles.clear();
- last = ke;
- }
- if (TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.hasColumns(key)) {
- directory = entry.getValue().toString();
- log.debug("Found directory " + directory + " for row " + key.getRow().toString());
- } else if (key.compareColumnFamily(DataFileColumnFamily.NAME) == 0) {
- String filename = key.getColumnQualifier().toString();
- knownFiles.add(filename);
- log.debug("METADATA file found: " + filename);
- }
- }
- if (directory != null) {
- // catch the last key extent
- count += addUnknownFiles(fs, directory, knownFiles, last, writer, opts.update);
- }
- log.info("There were " + count + " files that are unknown to the metadata table");
- writer.close();
- }
-
- private static int addUnknownFiles(FileSystem fs, String directory, Set<String> knownFiles, KeyExtent ke, MultiTableBatchWriter writer, boolean update)
- throws Exception {
- int count = 0;
- final String tableId = ke.getTableId().toString();
- final Text row = ke.getMetadataEntry();
- log.info(row.toString());
- for (String dir : ServerConstants.getTablesDirs()) {
- final Path path = new Path(dir + "/" + tableId + directory);
- for (FileStatus file : fs.listStatus(path)) {
- if (file.getPath().getName().endsWith("_tmp") || file.getPath().getName().endsWith("_tmp.rf"))
- continue;
- final String filename = directory + "/" + file.getPath().getName();
- if (!knownFiles.contains(filename)) {
- count++;
- final Mutation m = new Mutation(row);
- String size = Long.toString(file.getLen());
- String entries = "1"; // lie
- String value = size + "," + entries;
- m.put(DataFileColumnFamily.NAME, new Text(filename), new Value(value.getBytes(UTF_8)));
- if (update) {
- writer.getBatchWriter(MetadataTable.NAME).addMutation(m);
- }
- }
- }
- }
- return count;
- }
-
-}
[08/16] accumulo git commit: ACCUMULO-3172 Remove -dirty flag on
releases
Posted by ct...@apache.org.
ACCUMULO-3172 Remove -dirty flag on releases
Changes mavanagaiata plugin to stop incorrectly marking hashes as '-dirty'
when using maven-release-plugin to create releases.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4bac7484
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4bac7484
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4bac7484
Branch: refs/heads/master
Commit: 4bac748496df2f602a821dc0605fe4e4be9a6978
Parents: 8f4bc4c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:52:31 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:52:31 2014 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bac7484/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 835a2fa..8316a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,7 +383,7 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>0.6.1</version>
+ <version>0.7.0</version>
<configuration>
<skipNoGit>true</skipNoGit>
</configuration>
@@ -484,7 +484,7 @@
<!-- Work around MRELEASE-812 -->
<version>2.5</version>
<configuration>
- <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <arguments>-Dmavanagaiata.dirtyFlag=false -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean compile javadoc:aggregate deploy</goals>
<preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
[04/16] accumulo git commit: ACCUMULO-3352 Propagate bulk import
errors to client
Posted by ct...@apache.org.
ACCUMULO-3352 Propagate bulk import errors to client
Provide a better message in case of failures in bulk import, and propagate
those errors to the client, rather than swallow them on the server side, and
forcing the client to wait indefinitely.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52a6e977
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52a6e977
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52a6e977
Branch: refs/heads/1.6
Commit: 52a6e977fa4f4fe89e90a0f0b44dc04ef9024bb0
Parents: af957f9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:32:49 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:32:49 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/master/tableOps/BulkImport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/52a6e977/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 10cf224..9f41920 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -189,11 +189,11 @@ public class BulkImport extends MasterRepo {
private Path createNewBulkDir(VolumeManager fs, String tableId) throws IOException {
Path tempPath = fs.matchingFileSystem(new Path(sourceDir), ServerConstants.getTablesDirs());
if (tempPath == null)
- throw new IllegalStateException(sourceDir + " is not in a known namespace");
+ throw new IOException(sourceDir + " is not in a volume configured for Accumulo");
String tableDir = tempPath.toString();
if (tableDir == null)
- throw new IllegalStateException(sourceDir + " is not in a known namespace");
+ throw new IOException(sourceDir + " is not in a volume configured for Accumulo");
Path directory = new Path(tableDir + "/" + tableId);
fs.mkdirs(directory);
@@ -208,7 +208,7 @@ public class BulkImport extends MasterRepo {
while (true) {
Path newBulkDir = new Path(directory, Constants.BULK_PREFIX + namer.getNextName());
if (fs.exists(newBulkDir)) // sanity check
- throw new IllegalStateException("Dir exist when it should not " + newBulkDir);
+ throw new IOException("Dir exist when it should not " + newBulkDir);
if (fs.mkdirs(newBulkDir))
return newBulkDir;
log.warn("Failed to create " + newBulkDir + " for unknown reason");
[14/16] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Conflicts:
core/src/main/scripts/generate-thrift.sh
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f852e2e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f852e2e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f852e2e
Branch: refs/heads/master
Commit: 8f852e2efcd93304105eb15915c8f50d7fb5f49f
Parents: 52a6e97 1f8b668
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 15:50:35 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 15:50:35 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f852e2e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0d3323f,8316a33..ec55ebe
--- a/pom.xml
+++ b/pom.xml
@@@ -609,12 -484,12 +609,12 @@@
<!-- Work around MRELEASE-812 -->
<version>2.5</version>
<configuration>
- <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
- <arguments>-Dmavanagaiata.dirtyFlag=false -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
++ <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 -Dmavanagaiata.dirtyFlag=false</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
- <goals>clean compile javadoc:aggregate deploy</goals>
- <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+ <goals>clean deploy</goals>
+ <preparationGoals>clean verify</preparationGoals>
<tagNameFormat>@{project.version}</tagNameFormat>
- <releaseProfiles>seal-jars</releaseProfiles>
+ <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
[09/16] accumulo git commit: ACCUMULO-3172 Remove -dirty flag on
releases
Posted by ct...@apache.org.
ACCUMULO-3172 Remove -dirty flag on releases
Changes mavanagaiata plugin to stop incorrectly marking hashes as '-dirty'
when using maven-release-plugin to create releases.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4bac7484
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4bac7484
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4bac7484
Branch: refs/heads/1.6
Commit: 4bac748496df2f602a821dc0605fe4e4be9a6978
Parents: 8f4bc4c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:52:31 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:52:31 2014 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bac7484/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 835a2fa..8316a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,7 +383,7 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>0.6.1</version>
+ <version>0.7.0</version>
<configuration>
<skipNoGit>true</skipNoGit>
</configuration>
@@ -484,7 +484,7 @@
<!-- Work around MRELEASE-812 -->
<version>2.5</version>
<configuration>
- <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <arguments>-Dmavanagaiata.dirtyFlag=false -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean compile javadoc:aggregate deploy</goals>
<preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
[16/16] accumulo git commit: Merge branch '1.6'
Posted by ct...@apache.org.
Merge branch '1.6'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aa73e7f4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aa73e7f4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aa73e7f4
Branch: refs/heads/master
Commit: aa73e7f45c0931d9f350e096170874ac01c9c26a
Parents: d1af19d 8f852e2
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 15:52:46 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 15:52:46 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../server/util/AddFilesWithMissingEntries.java | 137 -------------------
.../accumulo/master/tableOps/BulkImport.java | 6 +-
.../test/stress/random/package-info.java | 3 +-
4 files changed, 5 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa73e7f4/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa73e7f4/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
[12/16] accumulo git commit: ACCUMULO-3437 Stricter thrift version
checking
Posted by ct...@apache.org.
ACCUMULO-3437 Stricter thrift version checking
Make Accumulo 1.5.x explicitly check for Thrift 0.9.0, not just 0.9.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f8b668f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f8b668f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f8b668f
Branch: refs/heads/1.6
Commit: 1f8b668f0904c091aafaef57bc6c818ae3acf201
Parents: 4bac748
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 15:02:13 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 15:02:13 2014 -0500
----------------------------------------------------------------------
core/src/main/scripts/generate-thrift.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f8b668f/core/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index 5a5d69f..64fe794 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -26,7 +26,7 @@
# INCLUDED_MODULES should be an array that includes other Maven modules with src/main/thrift directories
# Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
# ========================================================================================================================
-[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9'
+[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9.0'
[ -z $INCLUDED_MODULES ] && INCLUDED_MODULES=(../trace)
[ -z $BASE_OUTPUT_PACKAGE ] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
[ -z $PACKAGES_TO_GENERATE ] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data)
[10/16] accumulo git commit: ACCUMULO-3172 Remove -dirty flag on
releases
Posted by ct...@apache.org.
ACCUMULO-3172 Remove -dirty flag on releases
Changes mavanagaiata plugin to stop incorrectly marking hashes as '-dirty'
when using maven-release-plugin to create releases.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4bac7484
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4bac7484
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4bac7484
Branch: refs/heads/1.5
Commit: 4bac748496df2f602a821dc0605fe4e4be9a6978
Parents: 8f4bc4c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:52:31 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:52:31 2014 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bac7484/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 835a2fa..8316a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,7 +383,7 @@
<plugin>
<groupId>com.github.koraktor</groupId>
<artifactId>mavanagaiata</artifactId>
- <version>0.6.1</version>
+ <version>0.7.0</version>
<configuration>
<skipNoGit>true</skipNoGit>
</configuration>
@@ -484,7 +484,7 @@
<!-- Work around MRELEASE-812 -->
<version>2.5</version>
<configuration>
- <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <arguments>-Dmavanagaiata.dirtyFlag=false -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean compile javadoc:aggregate deploy</goals>
<preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
[11/16] accumulo git commit: ACCUMULO-3437 Stricter thrift version
checking
Posted by ct...@apache.org.
ACCUMULO-3437 Stricter thrift version checking
Make Accumulo 1.5.x explicitly check for Thrift 0.9.0, not just 0.9.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f8b668f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f8b668f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f8b668f
Branch: refs/heads/master
Commit: 1f8b668f0904c091aafaef57bc6c818ae3acf201
Parents: 4bac748
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 15:02:13 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 15:02:13 2014 -0500
----------------------------------------------------------------------
core/src/main/scripts/generate-thrift.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f8b668f/core/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index 5a5d69f..64fe794 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -26,7 +26,7 @@
# INCLUDED_MODULES should be an array that includes other Maven modules with src/main/thrift directories
# Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
# ========================================================================================================================
-[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9'
+[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9.0'
[ -z $INCLUDED_MODULES ] && INCLUDED_MODULES=(../trace)
[ -z $BASE_OUTPUT_PACKAGE ] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
[ -z $PACKAGES_TO_GENERATE ] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data)
[03/16] accumulo git commit: ACCUMULO-3352 Propagate bulk import
errors to client
Posted by ct...@apache.org.
ACCUMULO-3352 Propagate bulk import errors to client
Provide a better message in case of failures in bulk import, and propagate
those errors to the client, rather than swallow them on the server side, and
forcing the client to wait indefinitely.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52a6e977
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52a6e977
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52a6e977
Branch: refs/heads/master
Commit: 52a6e977fa4f4fe89e90a0f0b44dc04ef9024bb0
Parents: af957f9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:32:49 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:32:49 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/master/tableOps/BulkImport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/52a6e977/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 10cf224..9f41920 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -189,11 +189,11 @@ public class BulkImport extends MasterRepo {
private Path createNewBulkDir(VolumeManager fs, String tableId) throws IOException {
Path tempPath = fs.matchingFileSystem(new Path(sourceDir), ServerConstants.getTablesDirs());
if (tempPath == null)
- throw new IllegalStateException(sourceDir + " is not in a known namespace");
+ throw new IOException(sourceDir + " is not in a volume configured for Accumulo");
String tableDir = tempPath.toString();
if (tableDir == null)
- throw new IllegalStateException(sourceDir + " is not in a known namespace");
+ throw new IOException(sourceDir + " is not in a volume configured for Accumulo");
Path directory = new Path(tableDir + "/" + tableId);
fs.mkdirs(directory);
@@ -208,7 +208,7 @@ public class BulkImport extends MasterRepo {
while (true) {
Path newBulkDir = new Path(directory, Constants.BULK_PREFIX + namer.getNextName());
if (fs.exists(newBulkDir)) // sanity check
- throw new IllegalStateException("Dir exist when it should not " + newBulkDir);
+ throw new IOException("Dir exist when it should not " + newBulkDir);
if (fs.mkdirs(newBulkDir))
return newBulkDir;
log.warn("Failed to create " + newBulkDir + " for unknown reason");
[15/16] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Conflicts:
core/src/main/scripts/generate-thrift.sh
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f852e2e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f852e2e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f852e2e
Branch: refs/heads/1.6
Commit: 8f852e2efcd93304105eb15915c8f50d7fb5f49f
Parents: 52a6e97 1f8b668
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 15:50:35 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 15:50:35 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f852e2e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0d3323f,8316a33..ec55ebe
--- a/pom.xml
+++ b/pom.xml
@@@ -609,12 -484,12 +609,12 @@@
<!-- Work around MRELEASE-812 -->
<version>2.5</version>
<configuration>
- <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
- <arguments>-Dmavanagaiata.dirtyFlag=false -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
++ <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 -Dmavanagaiata.dirtyFlag=false</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
- <goals>clean compile javadoc:aggregate deploy</goals>
- <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
+ <goals>clean deploy</goals>
+ <preparationGoals>clean verify</preparationGoals>
<tagNameFormat>@{project.version}</tagNameFormat>
- <releaseProfiles>seal-jars</releaseProfiles>
+ <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
[13/16] accumulo git commit: ACCUMULO-3437 Stricter thrift version
checking
Posted by ct...@apache.org.
ACCUMULO-3437 Stricter thrift version checking
Make Accumulo 1.5.x explicitly check for Thrift 0.9.0, not just 0.9.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f8b668f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f8b668f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f8b668f
Branch: refs/heads/1.5
Commit: 1f8b668f0904c091aafaef57bc6c818ae3acf201
Parents: 4bac748
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 15:02:13 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 15:02:13 2014 -0500
----------------------------------------------------------------------
core/src/main/scripts/generate-thrift.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f8b668f/core/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index 5a5d69f..64fe794 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -26,7 +26,7 @@
# INCLUDED_MODULES should be an array that includes other Maven modules with src/main/thrift directories
# Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
# ========================================================================================================================
-[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9'
+[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9.0'
[ -z $INCLUDED_MODULES ] && INCLUDED_MODULES=(../trace)
[ -z $BASE_OUTPUT_PACKAGE ] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
[ -z $PACKAGES_TO_GENERATE ] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data)
[05/16] accumulo git commit: ACCUMULO-3126 Fix malformed
package-info.java
Posted by ct...@apache.org.
ACCUMULO-3126 Fix malformed package-info.java
Place javadoc above package declaration.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f4bc4c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f4bc4c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f4bc4c2
Branch: refs/heads/1.6
Commit: 8f4bc4c23a60ddef7eac5b20d6d08b2762931df1
Parents: c41b6dc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:45:33 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:45:33 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f4bc4c2/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java b/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
index 4a489dc..488a279 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.test.stress.random;
-
/**
* This package contains utility classes designed to test Accumulo when large cells are being written. This is an attempt to observe the behavior Accumulo
* displays when compacting and reading these cells.
@@ -34,3 +32,4 @@ package org.apache.accumulo.test.stress.random;
* There is no shared state intended by either of these services. This allows multiple clients to be run in parallel, either on the same host or distributed
* across hosts.
*/
+package org.apache.accumulo.test.stress.random;
[02/16] accumulo git commit: ACCUMULO-2381 Remove dangerous,
broken utility
Posted by ct...@apache.org.
ACCUMULO-2381 Remove dangerous, broken utility
Removes AddFilesWithMissingEntries utility, which does not support volumes,
does not properly work with the root table, assumes the list of files fit in
RAM, and does not satisfy a clear recovery use case for re-integrating
abandoned files into the metadata table.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af957f9c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af957f9c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af957f9c
Branch: refs/heads/master
Commit: af957f9cc76c7df93c7a61c2dd7f6ceff0aa1f3e
Parents: 76e7fff
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:16:07 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:16:07 2014 -0500
----------------------------------------------------------------------
.../server/util/AddFilesWithMissingEntries.java | 137 -------------------
1 file changed, 137 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/af957f9c/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java b/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
deleted file mode 100644
index 198b2d6..0000000
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
+++ /dev/null
@@ -1,137 +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.server.util;
-
-import static com.google.common.base.Charsets.UTF_8;
-
-import java.util.HashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.client.MultiTableBatchWriter;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.metadata.MetadataTable;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.server.ServerConstants;
-import org.apache.accumulo.server.cli.ClientOpts;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
-
-import com.beust.jcommander.Parameter;
-
-public class AddFilesWithMissingEntries {
-
- static final Logger log = Logger.getLogger(AddFilesWithMissingEntries.class);
-
- public static class Opts extends ClientOpts {
- @Parameter(names = "-update", description = "Make changes to the " + MetadataTable.NAME + " table to include missing files")
- boolean update = false;
- }
-
- /**
- * A utility to add files to the {@value MetadataTable#NAME} table that are not listed in the root tablet. This is a recovery tool for someone who knows what
- * they are doing. It might be better to save off files, and recover your instance by re-initializing and importing the existing files.
- */
- public static void main(String[] args) throws Exception {
- Opts opts = new Opts();
- BatchWriterOpts bwOpts = new BatchWriterOpts();
- opts.parseArgs(AddFilesWithMissingEntries.class.getName(), args, bwOpts);
-
- final Scanner scanner = opts.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- scanner.setRange(MetadataSchema.TabletsSection.getRange());
- final Configuration conf = new Configuration();
- final FileSystem fs = FileSystem.get(conf);
-
- KeyExtent last = new KeyExtent();
- String directory = null;
- Set<String> knownFiles = new HashSet<String>();
-
- int count = 0;
- final MultiTableBatchWriter writer = opts.getConnector().createMultiTableBatchWriter(bwOpts.getBatchWriterConfig());
-
- // collect the list of known files and the directory for each extent
- for (Entry<Key,Value> entry : scanner) {
- Key key = entry.getKey();
- KeyExtent ke = new KeyExtent(key.getRow(), (Text) null);
- // when the key extent changes
- if (!ke.equals(last)) {
- if (directory != null) {
- // add any files in the directory unknown to the key extent
- count += addUnknownFiles(fs, directory, knownFiles, last, writer, opts.update);
- }
- directory = null;
- knownFiles.clear();
- last = ke;
- }
- if (TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.hasColumns(key)) {
- directory = entry.getValue().toString();
- log.debug("Found directory " + directory + " for row " + key.getRow().toString());
- } else if (key.compareColumnFamily(DataFileColumnFamily.NAME) == 0) {
- String filename = key.getColumnQualifier().toString();
- knownFiles.add(filename);
- log.debug("METADATA file found: " + filename);
- }
- }
- if (directory != null) {
- // catch the last key extent
- count += addUnknownFiles(fs, directory, knownFiles, last, writer, opts.update);
- }
- log.info("There were " + count + " files that are unknown to the metadata table");
- writer.close();
- }
-
- private static int addUnknownFiles(FileSystem fs, String directory, Set<String> knownFiles, KeyExtent ke, MultiTableBatchWriter writer, boolean update)
- throws Exception {
- int count = 0;
- final String tableId = ke.getTableId().toString();
- final Text row = ke.getMetadataEntry();
- log.info(row.toString());
- for (String dir : ServerConstants.getTablesDirs()) {
- final Path path = new Path(dir + "/" + tableId + directory);
- for (FileStatus file : fs.listStatus(path)) {
- if (file.getPath().getName().endsWith("_tmp") || file.getPath().getName().endsWith("_tmp.rf"))
- continue;
- final String filename = directory + "/" + file.getPath().getName();
- if (!knownFiles.contains(filename)) {
- count++;
- final Mutation m = new Mutation(row);
- String size = Long.toString(file.getLen());
- String entries = "1"; // lie
- String value = size + "," + entries;
- m.put(DataFileColumnFamily.NAME, new Text(filename), new Value(value.getBytes(UTF_8)));
- if (update) {
- writer.getBatchWriter(MetadataTable.NAME).addMutation(m);
- }
- }
- }
- }
- return count;
- }
-
-}
[06/16] accumulo git commit: ACCUMULO-3126 Fix malformed
package-info.java
Posted by ct...@apache.org.
ACCUMULO-3126 Fix malformed package-info.java
Place javadoc above package declaration.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f4bc4c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f4bc4c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f4bc4c2
Branch: refs/heads/master
Commit: 8f4bc4c23a60ddef7eac5b20d6d08b2762931df1
Parents: c41b6dc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:45:33 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:45:33 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f4bc4c2/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java b/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
index 4a489dc..488a279 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.test.stress.random;
-
/**
* This package contains utility classes designed to test Accumulo when large cells are being written. This is an attempt to observe the behavior Accumulo
* displays when compacting and reading these cells.
@@ -34,3 +32,4 @@ package org.apache.accumulo.test.stress.random;
* There is no shared state intended by either of these services. This allows multiple clients to be run in parallel, either on the same host or distributed
* across hosts.
*/
+package org.apache.accumulo.test.stress.random;
[07/16] accumulo git commit: ACCUMULO-3126 Fix malformed
package-info.java
Posted by ct...@apache.org.
ACCUMULO-3126 Fix malformed package-info.java
Place javadoc above package declaration.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f4bc4c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f4bc4c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f4bc4c2
Branch: refs/heads/1.5
Commit: 8f4bc4c23a60ddef7eac5b20d6d08b2762931df1
Parents: c41b6dc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Dec 18 14:45:33 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Dec 18 14:45:33 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f4bc4c2/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java b/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
index 4a489dc..488a279 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/package-info.java
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.test.stress.random;
-
/**
* This package contains utility classes designed to test Accumulo when large cells are being written. This is an attempt to observe the behavior Accumulo
* displays when compacting and reading these cells.
@@ -34,3 +32,4 @@ package org.apache.accumulo.test.stress.random;
* There is no shared state intended by either of these services. This allows multiple clients to be run in parallel, either on the same host or distributed
* across hosts.
*/
+package org.apache.accumulo.test.stress.random;