storage: Rebalance based on logical bytes, not fraction of disk used

Fixes #17691
cockroachdb · Aug 17, 2017 · 764407c · 764407c
1 parent 8cf2141
commit 764407c
Show file tree

Hide file tree

Showing 11 changed files with 294 additions and 142 deletions.
diff --git a/c-deps/libroach/protos/cockroach/pkg/roachpb/metadata.pb.cc b/c-deps/libroach/protos/cockroach/pkg/roachpb/metadata.pb.cc
diff --git a/c-deps/libroach/protos/cockroach/pkg/roachpb/metadata.pb.h b/c-deps/libroach/protos/cockroach/pkg/roachpb/metadata.pb.h
diff --git a/pkg/roachpb/metadata.go b/pkg/roachpb/metadata.go
@@ -262,11 +262,12 @@ func (p Percentiles) String() string {
 
 // String returns a string representation of the StoreCapacity.
 func (sc StoreCapacity) String() string {
-	return fmt.Sprintf("diskUsed=%s/%s (%.2f%%), "+
+	return fmt.Sprintf("disk (capacity=%s, available=%s, logicalBytes=%s), "+
 		"ranges=%d, leases=%d, writes=%.2f, "+
 		"bytesPerReplica={%s}, writesPerReplica={%s}",
-		humanizeutil.IBytes(sc.Capacity-sc.Available), humanizeutil.IBytes(sc.Capacity),
-		sc.FractionUsed()*100, sc.RangeCount, sc.LeaseCount, sc.WritesPerSecond,
+		humanizeutil.IBytes(sc.Capacity), humanizeutil.IBytes(sc.Available),
+		humanizeutil.IBytes(sc.LogicalBytes),
+		sc.RangeCount, sc.LeaseCount, sc.WritesPerSecond,
 		sc.BytesPerReplica, sc.WritesPerReplica)
 }