merge: Merged fixed code into the main branch

opencurve · Oct 12, 2023 · cb71e98 · cb71e98
2 parents 1d57967 + 1abbfa9
commit cb71e98
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/client/client_metric.h b/src/client/client_metric.h
@@ -129,8 +129,13 @@ struct FileMetric {
     //Get leader failed and retry qps
     PerSecondMetric getLeaderRetryQPS;
 
+<<<<<<< HEAD
     // Number of slow requests
     SlowRequestMetric slowRequestMetric;
+=======
+    //The number of suspended IOs on the current file
+    IOSuspendMetric suspendRPCMetric;
+>>>>>>> 1abbfa9eb7c7dc0877592d6e28a0aea95bdfe55f
 
     DiscardMetric discardMetric;