Author: ecn
Date: Fri Mar 29 13:23:58 2013
New Revision: 1462469
URL: http://svn.apache.org/r1462469
Log:
ACCUMULO-1142 revert inadvertent check-in
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1462259,1462467
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1462259,1462467
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1462259,1462467
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1462259,1462467
Propchange:
accumulo/trunk/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:r1462259,1462467
Propchange:
accumulo/trunk/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:r1462259,1462467
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1462469&r1=1462468&r2=1462469&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Fri Mar 29 13:23:58 2013
@@ -223,7 +223,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
</plugins>
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1462259,1462467
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1462259,1462467
Modified:
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java?rev=1462469&r1=1462468&r2=1462469&view=diff
==============================================================================
---
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
(original)
+++
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java
Fri Mar 29 13:23:58 2013
@@ -52,12 +52,12 @@ public class GetMasterStats {
out(0, "State: " + stats.state.name());
out(0, "Goal State: " + stats.goalState.name());
if (stats.serversShuttingDown != null && stats.serversShuttingDown.size()
> 0) {
- out(0, "Servers to shutdown: ");
+ out(0, "Servers to shutdown");
for (String server : stats.serversShuttingDown) {
out(1, "%s", server);
}
}
- out(1, "Unassigned tablets: %d", stats.unassignedTablets);
+ out(0, "Unassigned tablets: %d", stats.unassignedTablets);
if (stats.badTServers != null && stats.badTServers.size() > 0) {
out(0, "Bad servers");
@@ -72,10 +72,10 @@ public class GetMasterStats {
out(1, "%s", entry.getKey());
out(2, "Records: %d", v.recs);
out(2, "Records in Memory: %d", v.recsInMemory);
- out(2, "Tablets %d", v.tablets);
- out(2, "Online Tablets %d", v.onlineTablets);
- out(2, "Ingest Rate %.2f", v.ingestRate);
- out(2, "Query Rate %.2f", v.queryRate);
+ out(2, "Tablets: %d", v.tablets);
+ out(2, "Online Tablets: %d", v.onlineTablets);
+ out(2, "Ingest Rate: %.2f", v.ingestRate);
+ out(2, "Query Rate: %.2f", v.queryRate);
}
}
if (stats.tServerInfo != null && stats.tServerInfo.size() > 0) {
@@ -83,37 +83,37 @@ public class GetMasterStats {
long now = System.currentTimeMillis();
for (TabletServerStatus server : stats.tServerInfo) {
TableInfo summary = Monitor.summarizeTableStats(server);
- out(1, "Name %s", server.name);
- out(2, "Ingest %.2f", summary.ingestRate);
- out(2, "Last Contact %s", server.lastContact);
- out(2, "OS Load Average %.2f", server.osLoad);
- out(2, "Queries %.2f", summary.queryRate);
- out(2, "Time Difference %.1f", ((now - server.lastContact) / 1000.));
- out(2, "Total Records %d", summary.recs);
- out(2, "Lookups %d", server.lookups);
+ out(1, "Name: %s", server.name);
+ out(2, "Ingest: %.2f", summary.ingestRate);
+ out(2, "Last Contact: %s", server.lastContact);
+ out(2, "OS Load Average: %.2f", server.osLoad);
+ out(2, "Queries: %.2f", summary.queryRate);
+ out(2, "Time Difference: %.1f", ((now - server.lastContact) / 1000.));
+ out(2, "Total Records: %d", summary.recs);
+ out(2, "Lookups: %d", server.lookups);
if (server.holdTime > 0)
- out(2, "Hold Time %d", server.holdTime);
+ out(2, "Hold Time: %d", server.holdTime);
if (server.tableMap != null && server.tableMap.size() > 0) {
out(2, "Tables");
for (Entry<String,TableInfo> status : server.tableMap.entrySet()) {
TableInfo info = status.getValue();
- out(3, "Table %s", status.getKey());
- out(4, "Tablets %d", info.onlineTablets);
- out(4, "Records %d", info.recs);
- out(4, "Records in Memory %d", info.recsInMemory);
- out(4, "Ingest %.2f", info.ingestRate);
- out(4, "Queries %.2f", info.queryRate);
- out(4, "Major Compacting %d", info.majors == null ? 0 :
info.majors.running);
- out(4, "Queued for Major Compaction %d", info.majors == null ? 0 :
info.majors.queued);
- out(4, "Minor Compacting %d", info.minors == null ? 0 :
info.minors.running);
- out(4, "Queued for Minor Compaction %d", info.minors == null ? 0 :
info.minors.queued);
+ out(3, "Table: %s", status.getKey());
+ out(4, "Tablets: %d", info.onlineTablets);
+ out(4, "Records: %d", info.recs);
+ out(4, "Records in Memory: %d", info.recsInMemory);
+ out(4, "Ingest: %.2f", info.ingestRate);
+ out(4, "Queries: %.2f", info.queryRate);
+ out(4, "Major Compacting: %d", info.majors == null ? 0 :
info.majors.running);
+ out(4, "Queued for Major Compaction: %d", info.majors == null ? 0
: info.majors.queued);
+ out(4, "Minor Compacting: %d", info.minors == null ? 0 :
info.minors.running);
+ out(4, "Queued for Minor Compaction: %d", info.minors == null ? 0
: info.minors.queued);
}
}
- out(2, "Recoveries %d", server.logSorts.size());
+ out(2, "Recoveries: %d", server.logSorts.size());
for (RecoveryStatus sort : server.logSorts) {
- out(3, "File %s", sort.name);
- out(3, "Progress %.2f%%", sort.progress * 100);
- out(3, "Time running %s", sort.runtime / 1000.);
+ out(3, "File: %s", sort.name);
+ out(3, "Progress: %.2f%%", sort.progress * 100);
+ out(3, "Time running: %s", sort.runtime / 1000.);
}
}
}
