You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/06/18 22:05:38 UTC
svn commit: r1494279 - in /accumulo/branches/ACCUMULO-118: ./ assemble/
core/ core/src/main/java/org/apache/accumulo/core/
core/src/main/java/org/apache/accumulo/core/client/impl/
core/src/main/java/org/apache/accumulo/core/data/ core/src/main/java/org...
Author: ecn
Date: Tue Jun 18 20:05:37 2013
New Revision: 1494279
URL: http://svn.apache.org/r1494279
Log:
ACCUMULO-118 merge trunk to sandbox
Added:
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
- copied unchanged from r1494233, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
Modified:
accumulo/branches/ACCUMULO-118/ (props changed)
accumulo/branches/ACCUMULO-118/assemble/ (props changed)
accumulo/branches/ACCUMULO-118/core/ (props changed)
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/Value.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
accumulo/branches/ACCUMULO-118/examples/ (props changed)
accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/ACCUMULO-118/pom.xml (props changed)
accumulo/branches/ACCUMULO-118/proxy/README (props changed)
accumulo/branches/ACCUMULO-118/server/ (props changed)
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/ServerConstants.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java (contents, props changed)
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
accumulo/branches/ACCUMULO-118/src/ (props changed)
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java
Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1493758-1494233
Merged /accumulo/branches/1.5:r1493894
Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
Merged /accumulo/trunk/assemble:r1493758-1494233
Merged /accumulo/branches/1.5/assemble:r1493894
Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/core:r1493758-1494233
Merged /accumulo/branches/1.5/core:r1493894
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java Tue Jun 18 20:05:37 2013
@@ -18,26 +18,18 @@ package org.apache.accumulo.core;
import java.nio.charset.Charset;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.PartialKey;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.ColumnFQ;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
public class Constants {
public static final Charset UTF8 = Charset.forName("UTF-8");
public static final String VERSION = FilteredConstants.VERSION;
- // versions should never be negative
- public static final Integer WIRE_VERSION = 2;
- public static final int DATA_VERSION = 5;
- public static final int PREV_DATA_VERSION = 4;
-
// Zookeeper locations
public static final String ZROOT = "/accumulo";
public static final String ZINSTANCES = "/instances";
@@ -60,6 +52,7 @@ public class Constants {
public static final String ZMASTERS = "/masters";
public static final String ZMASTER_LOCK = ZMASTERS + "/lock";
public static final String ZMASTER_GOAL_STATE = ZMASTERS + "/goal_state";
+
public static final String ZGC = "/gc";
public static final String ZGC_LOCK = ZGC + "/lock";
@@ -68,12 +61,11 @@ public class Constants {
public static final String ZTSERVERS = "/tservers";
public static final String ZDEAD = "/dead";
- public static final String ZDEADTSERVERS = "/dead/tservers";
+ public static final String ZDEADTSERVERS = ZDEAD + "/tservers";
public static final String ZTRACERS = "/tracers";
public static final String ZPROBLEMS = "/problems";
- public static final String ZUSERS = "/users";
public static final String BULK_ARBITRATOR_TYPE = "bulkTx";
@@ -94,8 +86,6 @@ public class Constants {
// reserved keyspace is any row that begins with a tilde '~' character
public static final Key METADATA_RESERVED_KEYSPACE_START_KEY = new Key(new Text(new byte[] {'~'}));
- public static final Key METADATA_RESERVED_KEYSPACE_STOP_KEY = new Key(new Text(new byte[] {'~' + 1}));
- public static final Range METADATA_RESERVED_KEYSPACE = new Range(METADATA_RESERVED_KEYSPACE_START_KEY, true, METADATA_RESERVED_KEYSPACE_STOP_KEY, false);
public static final String METADATA_DELETE_FLAG_PREFIX = "~del";
public static final String METADATA_DELETE_FLAG_FOR_METADATA_PREFIX = "!!" + METADATA_DELETE_FLAG_PREFIX;
public static final Range METADATA_DELETES_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_PREFIX)), true, new Key(new Text("~dem")), false);
@@ -139,19 +129,12 @@ public class Constants {
public static final Range METADATA_ROOT_TABLET_KEYSPACE = new Range(ROOT_TABLET_EXTENT.getMetadataEntry(), false, KeyExtent.getMetadataEntry(new Text(
METADATA_TABLE_ID), null), true);
- public static final String VALUE_ENCODING = "UTF-8";
-
public static final String BULK_PREFIX = "b-";
- public static final String OLD_BULK_PREFIX = "bulk_";
// note: all times are in milliseconds
public static final int SCAN_BATCH_SIZE = 1000; // this affects the table client caching of metadata
- public static final long MIN_MASTER_LOOP_TIME = 1000;
- public static final int MASTER_TABLETSERVER_CONNECTION_TIMEOUT = 3000;
- public static final long CLIENT_SLEEP_BEFORE_RECONNECT = 1000;
-
// Security configuration
public static final String PW_HASH_ALGORITHM = "SHA-256";
@@ -164,10 +147,8 @@ public class Constants {
public static final int DEFAULT_MINOR_COMPACTION_MAX_SLEEP_TIME = 60 * 3; // in seconds
public static final int MAX_DATA_TO_PRINT = 64;
- public static final int CLIENT_RETRIES = 5;
public static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2;
public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
- public static final String OLD_PACKAGE_NAME = "cloudbase";
public static final String VALID_TABLE_NAME_REGEX = "^\\w+$";
public static final String MAPFILE_EXTENSION = "map";
public static final String GENERATED_TABLET_DIRECTORY_PREFIX = "t-";
@@ -177,13 +158,4 @@ public class Constants {
public static final String EXPORT_FILE = "exportMetadata.zip";
public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
- public static String getBaseDir(final AccumuloConfiguration conf) {
- return conf.get(Property.INSTANCE_DFS_DIR);
- }
-
- public static Path getDataVersionLocation(final AccumuloConfiguration conf) {
- return new Path(getBaseDir(conf) + "/version");
- }
-
- public static final String AUDITLOG = "Audit";
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java Tue Jun 18 20:05:37 2013
@@ -231,6 +231,7 @@ class OfflineIterator implements Iterato
throw new AccumuloException(" " + currentExtent + " is not previous extent " + extent);
// TODO: ACCUMULO-118 needs fullpaths
+// String tablesDir = instance.getConfiguration().get(Property.INSTANCE_DFS_DIR) + "/tables";
List<String> absFiles = new ArrayList<String>();
for (String relPath : relFiles) {
if (relFiles.contains(":")) {
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/Value.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/Value.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/Value.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/Value.java Tue Jun 18 20:05:37 2013
@@ -22,7 +22,6 @@ import static org.apache.accumulo.core.u
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.util.List;
@@ -30,7 +29,6 @@ import org.apache.accumulo.core.Constant
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
-import org.apache.log4j.Logger;
/**
* A byte sequence that is usable as a key or value. Based on {@link org.apache.hadoop.io.BytesWritable} only this class is NOT resizable and DOES NOT
@@ -39,7 +37,6 @@ import org.apache.log4j.Logger;
*/
public class Value implements WritableComparable<Object> {
protected byte[] value;
- private static final Logger log = Logger.getLogger(Value.class);
/**
* Create a zero-size sequence.
@@ -142,12 +139,13 @@ public class Value implements WritableCo
return this.value.length;
}
+ @Override
public void readFields(final DataInput in) throws IOException {
this.value = new byte[in.readInt()];
in.readFully(this.value, 0, this.value.length);
}
- /** {@inheritDoc} */
+ @Override
public void write(final DataOutput out) throws IOException {
out.writeInt(this.value.length);
out.write(this.value, 0, this.value.length);
@@ -155,7 +153,6 @@ public class Value implements WritableCo
// Below methods copied from BytesWritable
- /** {@inheritDoc} */
@Override
public int hashCode() {
return WritableComparator.hashBytes(value, this.value.length);
@@ -168,6 +165,7 @@ public class Value implements WritableCo
* The other bytes writable
* @return Positive if left is bigger than right, 0 if they are equal, and negative if left is smaller than right.
*/
+ @Override
public int compareTo(Object right_obj) {
return compareTo(((Value) right_obj).get());
}
@@ -182,7 +180,6 @@ public class Value implements WritableCo
return (diff != 0) ? diff : WritableComparator.compareBytes(this.value, 0, this.value.length, that, 0, that.length);
}
- /** {@inheritDoc} */
@Override
public boolean equals(Object right_obj) {
if (right_obj instanceof byte[]) {
@@ -196,13 +193,7 @@ public class Value implements WritableCo
@Override
public String toString() {
- String retValue = "";
- try {
- retValue = new String(get(), Constants.VALUE_ENCODING);
- } catch (UnsupportedEncodingException e) {
- log.error(e.toString());
- }
- return retValue;
+ return new String(get(), Constants.UTF8);
}
/**
@@ -216,7 +207,6 @@ public class Value implements WritableCo
super(Value.class);
}
- /** {@inheritDoc} */
@Override
public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
return comparator.compare(b1, s1, l1, b2, s2, l2);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java Tue Jun 18 20:05:37 2013
@@ -44,14 +44,13 @@ class DispatchingFileFactory extends Fil
if (name.startsWith(Constants.MAPFILE_EXTENSION + "_")) {
return new MapFileOperations();
}
-
String[] sp = name.split("\\.");
- if (sp.length != 2) {
+ if (sp.length < 2) {
throw new IllegalArgumentException("File name " + name + " has no extension");
}
- String extension = sp[1];
+ String extension = sp[sp.length - 1];
if (extension.equals(Constants.MAPFILE_EXTENSION) || extension.equals(Constants.MAPFILE_EXTENSION + "_tmp")) {
return new MapFileOperations();
Propchange: accumulo/branches/ACCUMULO-118/examples/
------------------------------------------------------------------------------
Merged /accumulo/trunk/examples:r1493758-1494233
Merged /accumulo/branches/1.5/examples:r1493894
Propchange: accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1493894
Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1493758-1494233
Propchange: accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1493894
Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1493758-1494233
Propchange: accumulo/branches/ACCUMULO-118/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1493894
Merged /accumulo/trunk/pom.xml:r1493758-1494233
Propchange: accumulo/branches/ACCUMULO-118/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/trunk/proxy/README:r1493758-1494233
Merged /accumulo/branches/1.5/proxy/README:r1493894
Propchange: accumulo/branches/ACCUMULO-118/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1493894
Merged /accumulo/trunk/server:r1493758-1494233
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java Tue Jun 18 20:05:37 2013
@@ -48,9 +48,9 @@ public class Accumulo {
public static synchronized void updateAccumuloVersion(VolumeManager fs) {
try {
- if (getAccumuloPersistentVersion(fs) == Constants.PREV_DATA_VERSION) {
- fs.create(new Path(ServerConstants.getDataVersionLocation() + "/" + Constants.DATA_VERSION));
- fs.delete(new Path(ServerConstants.getDataVersionLocation() + "/" + Constants.PREV_DATA_VERSION));
+ if (getAccumuloPersistentVersion(fs) == ServerConstants.PREV_DATA_VERSION) {
+ fs.create(new Path(ServerConstants.getDataVersionLocation() + "/" + ServerConstants.DATA_VERSION));
+ fs.delete(new Path(ServerConstants.getDataVersionLocation() + "/" + ServerConstants.PREV_DATA_VERSION));
}
} catch (IOException e) {
throw new RuntimeException("Unable to set accumulo version: an error occurred.", e);
@@ -121,7 +121,7 @@ public class Accumulo {
Accumulo.waitForZookeeperAndHdfs(fs);
Version codeVersion = new Version(Constants.VERSION);
- if (dataVersion != Constants.DATA_VERSION && dataVersion != Constants.PREV_DATA_VERSION) {
+ if (dataVersion != ServerConstants.DATA_VERSION && dataVersion != ServerConstants.PREV_DATA_VERSION) {
throw new RuntimeException("This version of accumulo (" + codeVersion + ") is not compatible with files stored using data version " + dataVersion);
}
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/ServerConstants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/ServerConstants.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/ServerConstants.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/ServerConstants.java Tue Jun 18 20:05:37 2013
@@ -26,7 +26,12 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.Path;
public class ServerConstants {
-
+
+ // versions should never be negative
+ public static final Integer WIRE_VERSION = 2;
+ public static final int DATA_VERSION = 5;
+ public static final int PREV_DATA_VERSION = 4;
+
// these are functions to delay loading the Accumulo configuration unless we must
public static String[] getBaseDirs() {
String singleNamespace = ServerConfiguration.getSiteConfiguration().get(Property.INSTANCE_DFS_DIR);
@@ -84,5 +89,4 @@ public class ServerConstants {
public static String getRootTabletDir() {
return prefix(getMetadataTableDirs(), ZROOT_TABLET)[0];
}
-
}
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java Tue Jun 18 20:05:37 2013
@@ -394,8 +394,8 @@ public class VolumeManagerImpl implement
else
relPath = "/" + new String(tableId) + relPath;
String fullPath = ServerConstants.getTablesDirs()[0] + relPath;
- FileSystem ns = getFileSystemByPath(fullPath);
- return ns.makeQualified(new Path(fullPath));
+ FileSystem fs = getFileSystemByPath(fullPath);
+ return fs.makeQualified(new Path(fullPath));
}
@Override
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java Tue Jun 18 20:05:37 2013
@@ -291,10 +291,6 @@ public class GarbageCollectWriteAheadLog
return result;
}
- /**
- * @param name
- * @return
- */
static private boolean isUUID(String name) {
try {
UUID.fromString(name);
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java Tue Jun 18 20:05:37 2013
@@ -95,6 +95,7 @@ import org.apache.accumulo.fate.zookeepe
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
import org.apache.accumulo.server.Accumulo;
+import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.FileRef;
@@ -270,7 +271,7 @@ public class Master implements LiveTServ
}
private void upgradeZookeeper() {
- if (Accumulo.getAccumuloPersistentVersion(fs) == Constants.PREV_DATA_VERSION) {
+ if (Accumulo.getAccumuloPersistentVersion(fs) == ServerConstants.PREV_DATA_VERSION) {
try {
log.info("Upgrading zookeeper");
@@ -298,7 +299,7 @@ public class Master implements LiveTServ
private final ServerConfiguration serverConfig;
private void upgradeMetadata() {
- if (Accumulo.getAccumuloPersistentVersion(fs) == Constants.PREV_DATA_VERSION) {
+ if (Accumulo.getAccumuloPersistentVersion(fs) == ServerConstants.PREV_DATA_VERSION) {
if (upgradeMetadataRunning.compareAndSet(false, true)) {
Runnable upgradeTask = new Runnable() {
@Override
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java Tue Jun 18 20:05:37 2013
@@ -65,7 +65,7 @@ public class RecoveryManager {
log.warn(e, e);
}
}
-
+
private class LogSortTask implements Runnable {
private String source;
private String destination;
@@ -78,14 +78,14 @@ public class RecoveryManager {
this.destination = destination;
this.sortId = sortId;
}
-
+
@Override
public void run() {
boolean rescheduled = false;
try {
-
+
long time = closer.close(master, master.getFileSystem(), new Path(source));
-
+
if (time > 0) {
executor.schedule(this, time, TimeUnit.MILLISECONDS);
rescheduled = true;
@@ -114,13 +114,13 @@ public class RecoveryManager {
synchronized (this) {
sortsQueued.add(sortId);
}
-
+
final String path = ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY + "/" + sortId;
log.info("Created zookeeper entry " + path + " with data " + work);
}
Random random = new Random();
-
+
public boolean recoverLogs(KeyExtent extent, Collection<Collection<String>> walogs) throws IOException {
boolean recoveryNeeded = false;
for (Collection<String> logs : walogs) {
@@ -160,17 +160,16 @@ public class RecoveryManager {
synchronized (this) {
if (!closeTasksQueued.contains(sortId) && !sortsQueued.contains(sortId)) {
AccumuloConfiguration aconf = master.getConfiguration().getConfiguration();
- LogCloser closer = Master.createInstanceFromPropertyName(aconf, Property.MASTER_WALOG_CLOSER_IMPLEMETATION, LogCloser.class,
- new HadoopLogCloser());
+ LogCloser closer = Master.createInstanceFromPropertyName(aconf, Property.MASTER_WALOG_CLOSER_IMPLEMETATION, LogCloser.class, new HadoopLogCloser());
Long delay = recoveryDelay.get(sortId);
if (delay == null) {
delay = master.getSystemConfiguration().getTimeInMillis(Property.MASTER_RECOVERY_DELAY);
} else {
delay = Math.min(2 * delay, 1000 * 60 * 5l);
}
-
+
log.info("Starting recovery of " + filename + " (in : " + (delay / 1000) + "s) created for " + host + ", tablet " + extent + " holds a reference");
-
+
executor.schedule(new LogSortTask(closer, filename, dest, sortId), delay, TimeUnit.MILLISECONDS);
closeTasksQueued.add(sortId);
recoveryDelay.put(sortId, delay);
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java Tue Jun 18 20:05:37 2013
@@ -47,6 +47,7 @@ import org.apache.accumulo.core.data.Val
import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.fate.Repo;
+import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
@@ -159,7 +160,7 @@ class WriteExportFiles extends MasterRep
osw.append("srcZookeepers:" + conn.getInstance().getZooKeepers() + "\n");
osw.append("srcTableName:" + tableName + "\n");
osw.append("srcTableID:" + tableID + "\n");
- osw.append(ExportTable.DATA_VERSION_PROP + ":" + Constants.DATA_VERSION + "\n");
+ osw.append(ExportTable.DATA_VERSION_PROP + ":" + ServerConstants.DATA_VERSION + "\n");
osw.append("srcCodeVersion:" + Constants.VERSION + "\n");
osw.flush();
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java Tue Jun 18 20:05:37 2013
@@ -573,7 +573,7 @@ public class ImportTable extends MasterR
throw new ThriftTableOperationException(null, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER,
"Incompatible export version " + exportVersion);
- if (dataVersion == null || dataVersion > Constants.DATA_VERSION)
+ if (dataVersion == null || dataVersion > ServerConstants.DATA_VERSION)
throw new ThriftTableOperationException(null, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER,
"Incompatible data version " + exportVersion);
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java Tue Jun 18 20:05:37 2013
@@ -50,7 +50,8 @@ import org.apache.log4j.Logger;
*/
public class AuditedSecurityOperation extends SecurityOperation {
- public static final Logger audit = Logger.getLogger(Constants.AUDITLOG);
+ public static final String AUDITLOG = "Audit";
+ public static final Logger audit = Logger.getLogger(AUDITLOG);
public AuditedSecurityOperation(Authorizor author, Authenticator authent, PermissionHandler pm, String instanceId) {
super(author, authent, pm, instanceId);
@@ -116,9 +117,9 @@ public class AuditedSecurityOperation ex
audit.info("operation: " + prefix + "; user: " + credentials.getPrincipal() + "; " + String.format(template, args));
}
}
-
+
public static final String CAN_SCAN_AUDIT_TEMPLATE = "action: scan; targetTable: %s; authorizations: %s; range: %s; columns: %s; iterators: %s; iteratorOptions: %s;";
-
+
@Override
public boolean canScan(TCredentials credentials, String tableId, TRange range, List<TColumn> columns, List<IterInfo> ssiList,
Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations) throws ThriftSecurityException {
@@ -140,8 +141,9 @@ public class AuditedSecurityOperation ex
return super.canScan(credentials, tableId);
}
}
+
public static final String CAN_SCAN_BATCH_AUDIT_TEMPLATE = "action: scan; targetTable: %s; authorizations: %s; range: %s; columns: %s; iterators: %s; iteratorOptions: %s;";
-
+
@Override
public boolean canScan(TCredentials credentials, String tableId, Map<TKeyExtent,List<TRange>> tbatch, List<TColumn> tcolumns, List<IterInfo> ssiList,
Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations) throws ThriftSecurityException {
@@ -165,8 +167,9 @@ public class AuditedSecurityOperation ex
return super.canScan(credentials, tableId);
}
}
+
public static final String CHANGE_AUTHORIZATIONS_AUDIT_TEMPLATE = "action: changeAuthorizations; targetUser: %s; authorizations: %s";
-
+
@Override
public void changeAuthorizations(TCredentials credentials, String user, Authorizations authorizations) throws ThriftSecurityException {
try {
@@ -177,8 +180,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CHANGE_PASSWORD_AUDIT_TEMPLATE = "action: changePassword; targetUser: %s;";
-
+
@Override
public void changePassword(TCredentials credentials, TCredentials newInfo) throws ThriftSecurityException {
try {
@@ -189,8 +193,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CREATE_USER_AUDIT_TEMPLATE = "action: createUser; targetUser: %s; Authorizations: %s;";
-
+
@Override
public void createUser(TCredentials credentials, TCredentials newUser, Authorizations authorizations) throws ThriftSecurityException {
try {
@@ -201,8 +206,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_CREATE_TABLE_AUDIT_TEMPLATE = "action: createTable; targetTable: %s;";
-
+
@Override
public boolean canCreateTable(TCredentials c, String tableName) throws ThriftSecurityException {
try {
@@ -214,8 +220,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_DELETE_TABLE_AUDIT_TEMPLATE = "action: deleteTable; targetTable: %s;";
-
+
@Override
public boolean canDeleteTable(TCredentials c, String tableId) throws ThriftSecurityException {
String tableName = getTableName(tableId);
@@ -228,8 +235,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_RENAME_TABLE_AUDIT_TEMPLATE = "action: renameTable; targetTable: %s; newTableName: %s;";
-
+
@Override
public boolean canRenameTable(TCredentials c, String tableId, String oldTableName, String newTableName) throws ThriftSecurityException {
try {
@@ -241,8 +249,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_CLONE_TABLE_AUDIT_TEMPLATE = "action: cloneTable; targetTable: %s; newTableName: %s";
-
+
@Override
public boolean canCloneTable(TCredentials c, String tableId, String tableName) throws ThriftSecurityException {
String oldTableName = getTableName(tableId);
@@ -255,8 +264,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_DELETE_RANGE_AUDIT_TEMPLATE = "action: deleteData; targetTable: %s; startRange: %s; endRange: %s;";
-
+
@Override
public boolean canDeleteRange(TCredentials c, String tableId, String tableName, Text startRow, Text endRow) throws ThriftSecurityException {
try {
@@ -268,8 +278,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_BULK_IMPORT_AUDIT_TEMPLATE = "action: bulkImport; targetTable: %s; dataDir: %s; failDir: %s;";
-
+
@Override
public boolean canBulkImport(TCredentials c, String tableId, String tableName, String dir, String failDir) throws ThriftSecurityException {
try {
@@ -281,8 +292,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_IMPORT_AUDIT_TEMPLATE = "action: import; targetTable: %s; dataDir: %s;";
-
+
@Override
public boolean canImport(TCredentials credentials, String tableName, String importDir) throws ThriftSecurityException {
@@ -295,8 +307,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_EXPORT_AUDIT_TEMPLATE = "action: export; targetTable: %s; dataDir: %s;";
-
+
@Override
public boolean canExport(TCredentials credentials, String tableId, String tableName, String exportDir) throws ThriftSecurityException {
@@ -309,8 +322,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String DROP_USER_AUDIT_TEMPLATE = "action: dropUser; targetUser: %s;";
-
+
@Override
public void dropUser(TCredentials credentials, String user) throws ThriftSecurityException {
try {
@@ -321,8 +335,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String GRANT_SYSTEM_PERMISSION_AUDIT_TEMPLATE = "action: grantSystemPermission; permission: %s; targetUser: %s;";
-
+
@Override
public void grantSystemPermission(TCredentials credentials, String user, SystemPermission permission) throws ThriftSecurityException {
try {
@@ -333,8 +348,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String GRANT_TABLE_PERMISSION_AUDIT_TEMPLATE = "action: grantTablePermission; permission: %s; targetTable: %s; targetUser: %s;";
-
+
@Override
public void grantTablePermission(TCredentials credentials, String user, String tableId, TablePermission permission) throws ThriftSecurityException {
String tableName = getTableName(tableId);
@@ -346,8 +362,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String REVOKE_SYSTEM_PERMISSION_AUDIT_TEMPLATE = "action: revokeSystemPermission; permission: %s; targetUser: %s;";
-
+
@Override
public void revokeSystemPermission(TCredentials credentials, String user, SystemPermission permission) throws ThriftSecurityException {
@@ -359,8 +376,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String REVOKE_TABLE_PERMISSION_AUDIT_TEMPLATE = "action: revokeTablePermission; permission: %s; targetTable: %s; targetUser: %s;";
-
+
@Override
public void revokeTablePermission(TCredentials credentials, String user, String tableId, TablePermission permission) throws ThriftSecurityException {
String tableName = getTableName(tableId);
@@ -372,8 +390,9 @@ public class AuditedSecurityOperation ex
throw ex;
}
}
+
public static final String CAN_ONLINE_OFFLINE_TABLE_AUDIT_TEMPLATE = "action: %s; targetTable: %s;";
-
+
@Override
public boolean canOnlineOfflineTable(TCredentials credentials, String tableId, TableOperation op) throws ThriftSecurityException {
String tableName = getTableName(tableId);
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java Tue Jun 18 20:05:37 2013
@@ -30,6 +30,7 @@ import org.apache.accumulo.core.client.s
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.commons.codec.binary.Base64;
@@ -62,7 +63,7 @@ public class SecurityConstants {
}
private static AuthenticationToken makeSystemPassword() {
- int wireVersion = Constants.WIRE_VERSION;
+ int wireVersion = ServerConstants.WIRE_VERSION;
byte[] inst = HdfsZooInstance.getInstance().getInstanceID().getBytes(Constants.UTF8);
try {
confChecksum = getSystemConfigChecksum();
@@ -92,7 +93,7 @@ public class SecurityConstants {
// seed the config with the version and instance id, so at least
// it's not empty
- md.update(Constants.WIRE_VERSION.toString().getBytes(Constants.UTF8));
+ md.update(ServerConstants.WIRE_VERSION.toString().getBytes(Constants.UTF8));
md.update(HdfsZooInstance.getInstance().getInstanceID().getBytes(Constants.UTF8));
for (Entry<String,String> entry : ServerConfiguration.getSiteConfiguration()) {
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Tue Jun 18 20:05:37 2013
@@ -3232,6 +3232,7 @@ public class TabletServer extends Abstra
}
}
+
public void minorCompactionFinished(CommitSession tablet, String newDatafile, int walogSeq) throws IOException {
totalMinorCompactions++;
logger.minorCompactionFinished(tablet, newDatafile, walogSeq);
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/Initialize.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/Initialize.java Tue Jun 18 20:05:37 2013
@@ -232,7 +232,7 @@ public class Initialize {
final Path metadataTableDirs[] = paths(ServerConstants.getMetadataTableDirs());
- fs.mkdirs(new Path(ServerConstants.getDataVersionLocation(), "" + Constants.DATA_VERSION));
+ fs.mkdirs(new Path(ServerConstants.getDataVersionLocation(), "" + ServerConstants.DATA_VERSION));
// create an instance id
fs.mkdirs(ServerConstants.getInstanceIdLocation());
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java Tue Jun 18 20:05:37 2013
@@ -129,9 +129,8 @@ public class TableDiskUsage {
void print(String line);
}
- public static void printDiskUsage(AccumuloConfiguration acuConf, Collection<String> tables, FileSystem fs, Connector conn, boolean humanReadable)
- throws TableNotFoundException,
- IOException {
+ public static void printDiskUsage(AccumuloConfiguration acuConf, Collection<String> tables, FileSystem fs, Connector conn, boolean humanReadable)
+ throws TableNotFoundException, IOException {
printDiskUsage(acuConf, tables, fs, conn, new Printer() {
@Override
public void print(String line) {
@@ -245,8 +244,8 @@ public class TableDiskUsage {
return usage;
}
- public static void printDiskUsage(AccumuloConfiguration acuConf, Collection<String> tables, FileSystem fs, Connector conn, Printer printer, boolean humanReadable)
- throws TableNotFoundException, IOException {
+ public static void printDiskUsage(AccumuloConfiguration acuConf, Collection<String> tables, FileSystem fs, Connector conn, Printer printer,
+ boolean humanReadable) throws TableNotFoundException, IOException {
HashSet<String> tableIds = new HashSet<String>();
@@ -259,7 +258,7 @@ public class TableDiskUsage {
}
Map<TreeSet<String>,Long> usage = getDiskUsage(acuConf, tableIds, fs, conn);
-
+
String valueFormat = humanReadable ? "%9s" : "%,24d";
for (Entry<TreeSet<String>,Long> entry : usage.entrySet()) {
Object value = humanReadable ? NumUtil.bigNumberForSize(entry.getValue()) : entry.getValue();
Propchange: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jun 18 20:05:37 2013
@@ -0,0 +1,15 @@
+/accumulo/branches/1.3/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1330944
+/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1309369,1328076,1330246,1330264,1349971,1354669
+/accumulo/branches/1.4/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1305403-1492947
+/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1393868,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1438669,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1468531,1468958,1480033,1482989,1483954
+/accumulo/branches/1.4.2/src/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1399210,1402681
+/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1447769-1492948,1493894
+/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1449464-1451386
+/accumulo/branches/ACCUMULO-672/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java:1486112-1494261
+/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1486112-1494233
+/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400
+/incubator/accumulo/branches/1.4/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1201899-1305402
+/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc/src/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java:1304025,1305326
Modified: accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java (original)
+++ accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java Tue Jun 18 20:05:37 2013
@@ -16,12 +16,11 @@
*/
package org.apache.accumulo.server.util;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -42,7 +41,7 @@ public class ZooKeeperMain {
Opts opts = new Opts();
opts.parseArgs(ZooKeeperMain.class.getName(), args);
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
- String baseDir = Constants.getBaseDir(ServerConfiguration.getSiteConfiguration());
+ String baseDir = ServerConstants.getBaseDirs()[0];
System.out.println("Using " + fs.makeQualified(new Path(baseDir + "/instance_id")) + " to lookup accumulo instance");
Instance instance = HdfsZooInstance.getInstance();
if (opts.servers == null) {
@@ -50,7 +49,7 @@ public class ZooKeeperMain {
}
System.out.println("The accumulo instance id is " + instance.getInstanceID());
if (!opts.servers.contains("/"))
- opts.servers += "/accumulo/"+instance.getInstanceID();
- org.apache.zookeeper.ZooKeeperMain.main(new String[]{"-server", opts.servers, "-timeout", "" + (opts.timeout * 1000)});
+ opts.servers += "/accumulo/" + instance.getInstanceID();
+ org.apache.zookeeper.ZooKeeperMain.main(new String[] {"-server", opts.servers, "-timeout", "" + (opts.timeout * 1000)});
}
}
Propchange: accumulo/branches/ACCUMULO-118/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1493758-1494233
Merged /accumulo/branches/1.5/src:r1493894
Modified: accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java (original)
+++ accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java Tue Jun 18 20:05:37 2013
@@ -52,9 +52,6 @@ import org.apache.hadoop.io.Text;
public class MetadataBatchScanTest {
- /**
- * @param args
- */
public static void main(String[] args) throws Exception {
final Connector connector = new ZooKeeperInstance("acu14", "localhost")
@@ -165,10 +162,7 @@ public class MetadataBatchScanTest {
}
private static ScanStats runScanTest(Connector connector, int numLoop, List<Range> ranges) throws Exception {
- Scanner scanner = null;/*
- * connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); ColumnFQ.fetch(scanner,
- * Constants.METADATA_LOCATION_COLUMN); ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN);
- */
+ Scanner scanner = null;
BatchScanner bs = connector.createBatchScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY, 1);
bs.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
Modified: accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java?rev=1494279&r1=1494278&r2=1494279&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java (original)
+++ accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java Tue Jun 18 20:05:37 2013
@@ -21,11 +21,22 @@ import static org.junit.Assert.assertTru
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
-import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.client.*;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchScanner;
+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.Scanner;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
@@ -66,8 +77,7 @@ public class AuditMessageTest {
private final String THIRD_TEST_TABLE_NAME = "pears";
private final Authorizations auths = new Authorizations("private", "public");
private static TemporaryFolder folder = new TemporaryFolder();
-
-
+
// Must be static to survive Junit re-initialising the class every time.
private static String lastAuditTimestamp;
private Connector auditConnector;
@@ -93,7 +103,6 @@ public class AuditMessageTest {
logWriters = accumulo.getLogWriters();
}
-
/**
* Returns a List of Audit messages that have been grep'd out of the MiniAccumuloCluster output.
*
@@ -118,7 +127,7 @@ public class AuditMessageTest {
try {
while (it.hasNext()) {
String line = it.nextLine();
- if (line.matches(".* \\[" + Constants.AUDITLOG + "\\s*\\].*")) {
+ if (line.matches(".* \\[" + AuditedSecurityOperation.AUDITLOG + "\\s*\\].*")) {
// Only include the message if startTimestamp is null. or the message occurred after the startTimestamp value
if ((lastAuditTimestamp == null) || (line.substring(0, 23).compareTo(lastAuditTimestamp) > 0))
result.add(line);
@@ -406,7 +415,8 @@ public class AuditMessageTest {
auditConnector.tableOperations().rename(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME);
} catch (AccumuloSecurityException ex) {}
try {
- auditConnector.tableOperations().clone(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME, true, Collections.<String,String>emptyMap(), Collections.<String>emptySet());
+ auditConnector.tableOperations().clone(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME, true, Collections.<String,String> emptyMap(),
+ Collections.<String> emptySet());
} catch (AccumuloSecurityException ex) {}
try {
auditConnector.tableOperations().delete(OLD_TEST_TABLE_NAME);
@@ -480,11 +490,11 @@ public class AuditMessageTest {
assertEquals(1, findAuditMessage(auditMessages, String.format(AuditedSecurityOperation.CREATE_USER_AUDIT_TEMPLATE, "root", "")).size());
}
-
+
@AfterClass
public static void tearDownMiniCluster() throws Exception {
accumulo.stop();
-
+
// Comment this out to have a look at the logs, they will be in /tmp/junit*
folder.delete();
}