natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce error metrics for repair 

patch by Simon Zhou; reviewed by Stefan Podkowinski for CASSANDRA-13387
This commit is contained in:
Simon Zhou 2017-03-30 20:45:03 -07:00 committed by Stefan Podkowinski
parent 9b82827528
commit 284271670c
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
4.0
* Introduce error metrics for repair (CASSANDRA-13387)
* Refactoring to primitive functional interfaces in AuthCache (CASSANDRA-13732)
* Update metrics to 3.1.5 (CASSANDRA-13648)
* batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699)

3
src/java/org/apache/cassandra/metrics/StorageMetrics.java
View File

@ -29,7 +29,8 @@ public class StorageMetrics
private static final MetricNameFactory factory = new DefaultNameFactory("Storage");
public static final Counter load = Metrics.counter(factory.createMetricName("Load"));
public static final Counter exceptions = Metrics.counter(factory.createMetricName("Exceptions"));
public static final Counter uncaughtExceptions = Metrics.counter(factory.createMetricName("Exceptions"));
public static final Counter totalHintsInProgress = Metrics.counter(factory.createMetricName("TotalHintsInProgress"));
public static final Counter totalHints = Metrics.counter(factory.createMetricName("TotalHints"));
public static final Counter repairExceptions = Metrics.counter(factory.createMetricName("RepairExceptions"));
}

10
src/java/org/apache/cassandra/repair/RepairRunnable.java
View File

@ -17,6 +17,7 @@
*/
package org.apache.cassandra.repair;
import java.io.IOException;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.*;
@ -50,6 +51,7 @@ import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.repair.consistent.CoordinatorSession;
import org.apache.cassandra.metrics.StorageMetrics;
import org.apache.cassandra.repair.messages.RepairOption;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.service.QueryState;
@ -121,6 +123,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
protected void fireErrorAndComplete(int progressCount, int totalProgress, String message)
{
StorageMetrics.repairExceptions.inc();
fireProgressEvent(new ProgressEvent(ProgressEventType.ERROR, progressCount, totalProgress, message));
String completionMessage = String.format("Repair command #%d finished with error", cmd);
fireProgressEvent(new ProgressEvent(ProgressEventType.COMPLETE, progressCount, totalProgress, completionMessage));
@ -144,7 +147,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
validColumnFamilies = storageService.getValidColumnFamilies(false, false, keyspace, columnFamilies);
progress.incrementAndGet();
}
catch (IllegalArgumentException e)
catch (IllegalArgumentException | IOException e)
{
logger.error("Repair failed:", e);
fireErrorAndComplete(progress.get(), totalProgress, e.getMessage());
@ -396,6 +399,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
public void onFailure(Throwable t)
{
StorageMetrics.repairExceptions.inc();
fireProgressEvent(new ProgressEvent(ProgressEventType.ERROR, progress.get(), totalProgress, t.getMessage()));
logger.error("Error completing preview repair", t);
String completionMessage = complete();
@ -476,6 +480,8 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
public void onFailure(Throwable t)
{
StorageMetrics.repairExceptions.inc();
String message = String.format("Repair session %s for range %s failed with error %s",
session.getId(), session.getRanges().toString(), t.getMessage());
logger.error(message, t);
@ -519,6 +525,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
final String message;
if (hasFailure.get())
{
StorageMetrics.repairExceptions.inc();
message = "Some repair failed";
fireProgressEvent(new ProgressEvent(ProgressEventType.ERROR, progress.get(), totalProgress,
message));
@ -543,6 +550,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti
public void onFailure(Throwable t)
{
StorageMetrics.repairExceptions.inc();
fireProgressEvent(new ProgressEvent(ProgressEventType.ERROR, progress.get(), totalProgress, t.getMessage()));
if (!options.isPreview())
{

2
src/java/org/apache/cassandra/service/CassandraDaemon.java
View File

@ -207,7 +207,7 @@ public class CassandraDaemon
{
public void uncaughtException(Thread t, Throwable e)
{
StorageMetrics.exceptions.inc();
StorageMetrics.uncaughtExceptions.inc();
logger.error("Exception in thread " + t, e);
Tracing.trace("Exception in thread {}", t, e);
for (Throwable e2 = e; e2 != null; e2 = e2.getCause())

2
src/java/org/apache/cassandra/tools/NodeProbe.java
View File

@ -1100,7 +1100,7 @@ public class NodeProbe implements AutoCloseable
public int getExceptionCount()
{
return (int)StorageMetrics.exceptions.getCount();
return (int)StorageMetrics.uncaughtExceptions.getCount();
}
public Map<String, Integer> getDroppedMessages()