You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/10/07 18:23:06 UTC
svn commit: r822787 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra:
service/LoadDisseminator.java service/StorageLoadBalancer.java
service/StorageService.java service/StorageServiceMBean.java
tools/NodeProbe.java
Author: jbellis
Date: Wed Oct 7 16:23:05 2009
New Revision: 822787
URL: http://svn.apache.org/viewvc?rev=822787&view=rev
Log:
clean up loadinfo and SLB
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java?rev=822787&r1=822786&r2=822787&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java Wed Oct 7 16:23:05 2009
@@ -34,8 +34,7 @@
{
try
{
- long diskSpace = FileUtils.getUsedDiskSpace();
- String diskUtilization = FileUtils.stringifyFileSize(diskSpace);
+ String diskUtilization = String.valueOf(StorageService.instance().getLoad());
if (logger_.isDebugEnabled())
logger_.debug("Disseminating load info ...");
Gossiper.instance().addApplicationState(LoadDisseminator.loadInfo_, new ApplicationState(diskUtilization));
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java?rev=822787&r1=822786&r2=822787&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java Wed Oct 7 16:23:05 2009
@@ -375,11 +375,7 @@
class MoveMessage implements Serializable
{
- private Token targetToken_;
-
- private MoveMessage()
- {
- }
+ private final Token targetToken_;
MoveMessage(Token targetToken)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=822787&r1=822786&r2=822787&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Wed Oct 7 16:23:05 2009
@@ -498,24 +498,16 @@
}
}
- /**
- * Get the count of primary keys from the sampler.
- */
- public String getLoadInfo()
+ /** raw load value */
+ public double getLoad()
{
- long diskSpace = FileUtils.getUsedDiskSpace();
- return FileUtils.stringifyFileSize(diskSpace);
+ return FileUtils.getUsedDiskSpace();
}
- /**
- * Get the primary count info for this endpoint.
- * This is gossiped around and cached in the
- * StorageLoadBalancer.
- */
- public String getLoadInfo(EndPoint ep)
+ /** Human-readable load value */
+ public String getLoadString()
{
- LoadInfo li = storageLoadBalancer_.getLoad(ep);
- return ( li == null ) ? "N/A" : li.toString();
+ return FileUtils.stringifyFileSize(FileUtils.getUsedDiskSpace());
}
/*
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java?rev=822787&r1=822786&r2=822787&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java Wed Oct 7 16:23:05 2009
@@ -32,7 +32,7 @@
public String getUnreachableNodes();
public String getToken();
public Map<Range, List<EndPoint>> getRangeToEndPointMap();
- public String getLoadInfo();
+ public String getLoadString();
public int getCurrentGenerationNumber();
public void forceTableCompaction() throws IOException;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=822787&r1=822786&r2=822787&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Wed Oct 7 16:23:05 2009
@@ -227,18 +227,7 @@
{
return ssProxy.getCurrentGenerationNumber();
}
-
- /**
- * Retrieve a textual representation of the on-disk size of data
- * stored on this node.
- *
- * @return the size description
- */
- public String getLoadInfo()
- {
- return ssProxy.getLoadInfo();
- }
-
+
/**
* Trigger a cleanup of keys on all tables.
*/
@@ -444,7 +433,7 @@
public void printInfo(PrintStream outs)
{
outs.println(getToken());
- outs.println(String.format("%-17s: %s", "Load Info", getLoadInfo()));
+ outs.println(String.format("%-17s: %s", "Load", ssProxy.getLoadString()));
outs.println(String.format("%-17s: %s", "Generation No", getCurrentGenerationNumber()));
// Uptime