From dab5350a2f9edec7792c1a0ffeb979b77cec36ec Mon Sep 17 00:00:00 2001 From: CoderJeffrey Date: Thu, 29 Jun 2023 16:18:52 -0700 Subject: [PATCH] Remove comments and refactor (Signed-off-by: Jeffrey Liu ujeffliu@amazon.com) Signed-off-by: CoderJeffrey --- .../reader/MetricsEmitter.java | 9 +++-- .../SearchBackPressureMetricsProcessor.java | 12 ++----- .../SearchBackPressureMetricsSnapShot.java | 35 +++++++++++-------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java index 28d7b6dbe..7af8334dd 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java +++ b/src/main/java/org/opensearch/performanceanalyzer/reader/MetricsEmitter.java @@ -755,9 +755,10 @@ public static void emitSearchBackPressureMetrics( long mCurrT = System.currentTimeMillis(); Result searchbp_records = searchBackPressureMetricsSnapShot.fetchAll(); - // String SEARCHBP_MODE_DIM = "searchbp_mode"; - String SEARCHBP_TYPE_DIM = AllMetrics.SearchBackPressureStatsValue.SEARCHBP_TYPE_DIM.toString(); - String SEARCHBP_TABLE_NAME = AllMetrics.SearchBackPressureStatsValue.SEARCHBP_TABLE_NAME.toString(); + String SEARCHBP_TYPE_DIM = + AllMetrics.SearchBackPressureStatsValue.SEARCHBP_TYPE_DIM.toString(); + String SEARCHBP_TABLE_NAME = + AllMetrics.SearchBackPressureStatsValue.SEARCHBP_TABLE_NAME.toString(); List dims = new ArrayList() { @@ -838,8 +839,6 @@ public static void emitSearchBackPressureMetrics( for (Record record : searchbp_records) { for (String stats_type : stats_types) { Optional tmpStatsObj = Optional.ofNullable(record.get(stats_type)); - // LOG.info(stats_type + " is: " + tmpStatsObj.map(o -> - // Long.parseLong(o.toString())).toString()); handle.bind( stats_type, diff --git a/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsProcessor.java b/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsProcessor.java index e3ab8a90a..b21ca2f7a 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsProcessor.java +++ b/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsProcessor.java @@ -48,15 +48,7 @@ static SearchBackPressureMetricsProcessor buildSearchBackPressureMetricsProcesso Connection connection, NavigableMap searchBackPressureSnapshotNavigableMap) { - // if current metrics is in searchBackPressureSnapshotNavigableMap map - if (searchBackPressureSnapshotNavigableMap.get(currentWindowStartTime) == null) { - SearchBackPressureMetricsSnapShot searchBackPressureMetricsSnapShot = - new SearchBackPressureMetricsSnapShot(connection, currentWindowStartTime); - searchBackPressureSnapshotNavigableMap.put( - currentWindowStartTime, searchBackPressureMetricsSnapShot); - return new SearchBackPressureMetricsProcessor(searchBackPressureMetricsSnapShot); - } - + searchBackPressureSnapshotNavigableMap.putIfAbsent(currentWindowStartTime, new SearchBackPressureMetricsSnapShot(connection, currentWindowStartTime)); return new SearchBackPressureMetricsProcessor( searchBackPressureSnapshotNavigableMap.get(currentWindowStartTime)); } @@ -105,7 +97,7 @@ private void parseJsonLine(final String jsonString) { if (map.isEmpty()) { throw new RuntimeException("Missing SearchBackPressure Metrics payload."); } - + // A list of dims to be collected ArrayList required_searchbp_dims = new ArrayList() { diff --git a/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsSnapShot.java b/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsSnapShot.java index 0f4246cd9..907ab5540 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsSnapShot.java +++ b/src/main/java/org/opensearch/performanceanalyzer/reader/SearchBackPressureMetricsSnapShot.java @@ -28,7 +28,14 @@ public class SearchBackPressureMetricsSnapShot implements Removable { // entry point to interact with SQLite db private final DSLContext create; + /* + * This is a tmp table created to populate searchbp stats + * table name is the search_back_pressure_ + windowStartTime + */ private final String tableName; + + /* columns are the key metrics to be collected (e.g. shar-level search back pressure cancellation count) + */ private List> columns; // Create a table with specifed fields (columns) @@ -47,14 +54,14 @@ public SearchBackPressureMetricsSnapShot(Connection conn, Long windowStartTime) AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_CANCELLATIONCOUNT .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_CANCELLATIONCOUNT .toString()), - Long.class)); + Integer.class)); // Shard Stats Resource Heap / CPU Usage this.add( @@ -63,28 +70,28 @@ public SearchBackPressureMetricsSnapShot(Connection conn, Long windowStartTime) AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_RESOURCE_HEAP_USAGE_CANCELLATIONCOUNT .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_RESOURCE_HEAP_USAGE_CURRENTMAX .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_RESOURCE_HEAP_USAGE_ROLLINGAVG .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_RESOURCE_CPU_USAGE_CANCELLATIONCOUNT .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( @@ -92,14 +99,14 @@ public SearchBackPressureMetricsSnapShot(Connection conn, Long windowStartTime) AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_RESOURCE_CPU_USAGE_CURRENTMAX .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_SHARD_STATS_RESOURCE_CPU_USAGE_CURRENTAVG .toString()), - Long.class)); + Integer.class)); // Task Stats Resource Heap / CPU Usage this.add( @@ -108,28 +115,28 @@ public SearchBackPressureMetricsSnapShot(Connection conn, Long windowStartTime) AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_RESOURCE_HEAP_USAGE_CANCELLATIONCOUNT .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_RESOURCE_HEAP_USAGE_CURRENTMAX .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_RESOURCE_HEAP_USAGE_ROLLINGAVG .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_RESOURCE_CPU_USAGE_CANCELLATIONCOUNT .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( @@ -137,14 +144,14 @@ public SearchBackPressureMetricsSnapShot(Connection conn, Long windowStartTime) AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_RESOURCE_CPU_USAGE_CURRENTMAX .toString()), - Long.class)); + Integer.class)); this.add( DSL.field( DSL.name( AllMetrics.SearchBackPressureStatsValue .SEARCHBP_TASK_STATS_RESOURCE_CPU_USAGE_CURRENTAVG .toString()), - Long.class)); + Integer.class)); } };