Merge pull request #210 from apkar/more-metrics

Adding main thread (network thread) CPU usage metrics as well.

Author: apkar

src/Constants.cpp

@@ -79,6 +79,7 @@ const char* MT_RATE_IDX_REBUILD = "dl_index_rebuild_rate";
 const char* MT_RATE_TABLE_SCAN_DOCS = "dl_table_scan_rate";
 const char* MT_RATE_IDX_SCAN_DOCS = "dl_index_scan_rate";
 const char* MT_GUAGE_CPU_PERCENTAGE = "dl_cpu_percentage";
+const char* MT_GUAGE_MAIN_THREAD_CPU_PERCENTAGE = "dl_main_th_cpu_percentage";
 const char* MT_GUAGE_MEMORY_USAGE = "dl_memory_usage_bytes";
 
 } // namespace DocLayerConstants

src/Constants.h

@@ -92,6 +92,7 @@ extern const char* MT_RATE_IDX_REBUILD;
 extern const char* MT_RATE_TABLE_SCAN_DOCS;
 extern const char* MT_RATE_IDX_SCAN_DOCS;
 extern const char* MT_GUAGE_CPU_PERCENTAGE;
+extern const char* MT_GUAGE_MAIN_THREAD_CPU_PERCENTAGE;
 extern const char* MT_GUAGE_MEMORY_USAGE;
 
 } // namespace DocLayerConstants

src/DocLayer.actor.cpp

@@ -468,8 +468,14 @@ ACTOR void publishProcessMetrics() {
 			auto processMetrics = latestEventCache.get("ProcessMetrics");
 			double processMetricsElapsed = processMetrics.getDouble("Elapsed");
 			double cpuSeconds = processMetrics.getDouble("CPUSeconds");
-			double cpu_usage = std::max(0.0, cpuSeconds / processMetricsElapsed) * 100;
-			DocumentLayer::metricReporter->captureGauge(DocLayerConstants::MT_GUAGE_CPU_PERCENTAGE, cpu_usage);
+			double mainThreadCPUSeconds = processMetrics.getDouble("MainThreadCPUSeconds");
+
+			double cpuUsage = std::max(0.0, cpuSeconds / processMetricsElapsed) * 100;
+			double mainThreadCPUUsage = std::max(0.0, mainThreadCPUSeconds / processMetricsElapsed) * 100;
+
+			DocumentLayer::metricReporter->captureGauge(DocLayerConstants::MT_GUAGE_CPU_PERCENTAGE, cpuUsage);
+			DocumentLayer::metricReporter->captureGauge(DocLayerConstants::MT_GUAGE_MAIN_THREAD_CPU_PERCENTAGE,
+			                                            mainThreadCPUUsage);
 			DocumentLayer::metricReporter->captureGauge(DocLayerConstants::MT_GUAGE_MEMORY_USAGE,
 			                                            processMetrics.getInt64("Memory"));
 		};
@@ -551,7 +557,8 @@ ACTOR void setup(NetworkAddress na,
 					when(wait(t)) {
 						TraceEvent(SevError, "StartupFailure")
 						    .detail("phase", "ConnectToCluster")
-						    .detail("timeout", soFar);
+						    .detail("timeout", soFar)
+						    .error(timed_out());
 					}
 				}
 			} catch (Error& e) {