Updated repair % in ic-summary

instaclustr · Aug 10, 2018 · 4ff7774 · 4ff7774
1 parent d72ee89
commit 4ff7774
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -47,8 +47,8 @@ the largest column families and how much data has been repaired by incremental r
 | SSTables      | Number of sstables on this node for the column family       |
 | Disk Size     | Compressed size on disk for this node                       |
 | Data Size     | Uncompressed size of the data for this node                 |
-| Last Repaired | Time of the last incremental repair                         |
-| Repair %      | Percentage of data marked as repaired by incremental repair |
+| Last Repaired | Maximum repair timestamp on sstables                        |
+| Repair %      | Percentage of data marked as repaired                       |
 
 ## ic-sstables ##
 Print out sstable metadata for a column family. Useful in helping to tune compaction settings.

diff --git a/src/com/instaclustr/sstabletools/SummaryCollector.java b/src/com/instaclustr/sstabletools/SummaryCollector.java
@@ -54,13 +54,13 @@ public static void main(String[] args) {
                     long diskSize = 0;
                     long dataSize = 0;
                     long repairedAt = Long.MIN_VALUE;
-                    boolean isRepaired = false;
+                    long repaired = 0;
                     long repairedLength = 0;
                     for (SSTableMetadata metadata : metadataCollection) {
                         diskSize += metadata.diskLength;
                         dataSize += metadata.uncompressedLength;
                         if (metadata.isRepaired) {
-                            isRepaired = true;
+                            repaired++;
                             repairedAt = Math.max(repairedAt, metadata.repairedAt);
                             repairedLength += metadata.uncompressedLength;
                         }
@@ -71,8 +71,8 @@ public static void main(String[] args) {
                             Integer.toString(metadataCollection.size()),
                             Util.humanReadableByteCount(diskSize),
                             Util.humanReadableByteCount(dataSize),
-                            isRepaired ? Util.UTC_DATE_FORMAT.format(new Date(repairedAt)) : "",
-                            isRepaired ? String.format("%d%%", Math.round((repairedLength / (double) dataSize) * 100)) : ""
+                            repaired > 0 ? Util.UTC_DATE_FORMAT.format(new Date(repairedAt)) : "",
+                            repaired > 0 ? String.format("%d/%d %d%%", repaired, metadataCollection.size(), (int) Math.floor((repairedLength / (double) dataSize) * 100)) : ""
                     );
                 }
             }