Skip to content

Commit 9a77801

Browse files
author
Jay Deng
committed
WIP
1 parent 90aa335 commit 9a77801

File tree

3 files changed

+137
-1
lines changed

3 files changed

+137
-1
lines changed

‎src/main/java/org/opensearch/knn/plugin/stats/KNNRemoteIndexBuildValue.java

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package org.opensearch.knn.plugin.stats;
7+
8+
import lombok.Getter;
9+
10+
import java.util.concurrent.atomic.LongAdder;
11+
12+
public enum KNNRemoteIndexBuildValue {
13+
14+
// Repository Stats
15+
WRITE_SUCCESS_COUNT("write_success_count"),
16+
WRITE_FAILURE_COUNT("write_failure_count"),
17+
WRITE_SIZE("write_size_in_bytes"),
18+
WRITE_TIME("write_time_in_millis"),
19+
READ_SUCCESS_COUNT("read_success_count"),
20+
READ_FAILURE_COUNT("read_failure_count"),
21+
READ_SIZE("read_size_in_bytes"),
22+
READ_TIME("read_time_in_millis"),
23+
24+
BUILD_REQUEST_SUCCESS_COUNT("build_request_success_count"),
25+
BUILD_REQUEST_FAILURE_COUNT("build_request_failure_count"),
26+
STATUS_REQUEST_SUCCESS_COUNT("status_request_success_count"),
27+
STATUS_REQUEST_FAILURE_COUNT("status_request_failure_count"),
28+
INDEX_BUILD_SUCCESS_COUNT("index_build_success_count"),
29+
INDEX_BUILD_FAILURE_COUNT("index_build_failure_count"),
30+
WAITING_TIME("waiting_time_in_ms"),
31+
32+
REMOTE_FLUSH_TIME("remote_flush_time_in_millis"),
33+
REMOTE_MERGE_TIME("remote_merge_time_in_millis");
34+
35+
@Getter
36+
private final String name;
37+
private final LongAdder value;
38+
39+
/**
40+
* Constructor
41+
*
42+
* @param name name of the graph value
43+
*/
44+
KNNRemoteIndexBuildValue(String name) {
45+
this.name = name;
46+
this.value = new LongAdder();
47+
}
48+
49+
/**
50+
* Get the graph value
51+
*
52+
* @return value
53+
*/
54+
public Long getValue() {
55+
return value.longValue();
56+
}
57+
58+
/**
59+
* Increment the graph value
60+
*/
61+
public void increment() {
62+
value.increment();
63+
}
64+
65+
/**
66+
* Decrement the graph value
67+
*/
68+
public void decrement() {
69+
value.decrement();
70+
}
71+
72+
/**
73+
* Increment the graph value by a specified amount
74+
*
75+
* @param delta The amount to increment
76+
*/
77+
public void incrementBy(long delta) {
78+
value.add(delta);
79+
}
80+
81+
/**
82+
* Decrement the graph value by a specified amount
83+
*
84+
* @param delta The amount to decrement
85+
*/
86+
public void decrementBy(long delta) {
87+
value.add(delta * -1);
88+
}
89+
}

‎src/main/java/org/opensearch/knn/plugin/stats/KNNStats.java

+45-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import com.google.common.cache.CacheStats;
99
import com.google.common.collect.ImmutableMap;
1010
import org.opensearch.knn.common.KNNConstants;
11-
import org.opensearch.knn.index.memory.NativeMemoryCacheManager;
11+
import org.opensearch.knn.common.featureflags.KNNFeatureFlags;
1212
import org.opensearch.knn.index.engine.KNNEngine;
13+
import org.opensearch.knn.index.memory.NativeMemoryCacheManager;
1314
import org.opensearch.knn.indices.ModelCache;
1415
import org.opensearch.knn.indices.ModelDao;
1516
import org.opensearch.knn.plugin.stats.suppliers.EventOccurredWithinThresholdSupplier;
@@ -86,6 +87,10 @@ private Map<String, KNNStat<?>> buildStatsMap() {
8687
addScriptStats(builder);
8788
addModelStats(builder);
8889
addGraphStats(builder);
90+
if (KNNFeatureFlags.isKNNRemoteVectorBuildEnabled())
91+
{
92+
addRemoteIndexBuildStats(builder);
93+
}
8994
return builder.build();
9095
}
9196

@@ -210,12 +215,51 @@ private Map<String, Map<String, Object>> createGraphStatsMap() {
210215
mergeMap.put(KNNGraphValue.MERGE_TOTAL_TIME_IN_MILLIS.getName(), KNNGraphValue.MERGE_TOTAL_TIME_IN_MILLIS.getValue());
211216
mergeMap.put(KNNGraphValue.MERGE_TOTAL_DOCS.getName(), KNNGraphValue.MERGE_TOTAL_DOCS.getValue());
212217
mergeMap.put(KNNGraphValue.MERGE_TOTAL_SIZE_IN_BYTES.getName(), KNNGraphValue.MERGE_TOTAL_SIZE_IN_BYTES.getValue());
218+
if (KNNFeatureFlags.isKNNRemoteVectorBuildEnabled())
219+
{
220+
mergeMap.put(KNNRemoteIndexBuildValue.REMOTE_MERGE_TIME.getName(), KNNRemoteIndexBuildValue.REMOTE_MERGE_TIME.getValue());
221+
}
213222
Map<String, Object> refreshMap = new HashMap<>();
214223
refreshMap.put(KNNGraphValue.REFRESH_TOTAL_OPERATIONS.getName(), KNNGraphValue.REFRESH_TOTAL_OPERATIONS.getValue());
215224
refreshMap.put(KNNGraphValue.REFRESH_TOTAL_TIME_IN_MILLIS.getName(), KNNGraphValue.REFRESH_TOTAL_TIME_IN_MILLIS.getValue());
225+
if (KNNFeatureFlags.isKNNRemoteVectorBuildEnabled())
226+
{
227+
mergeMap.put(KNNRemoteIndexBuildValue.REMOTE_FLUSH_TIME.getName(), KNNRemoteIndexBuildValue.REMOTE_FLUSH_TIME.getValue());
228+
}
216229
Map<String, Map<String, Object>> graphStatsMap = new HashMap<>();
217230
graphStatsMap.put(StatNames.MERGE.getName(), mergeMap);
218231
graphStatsMap.put(StatNames.REFRESH.getName(), refreshMap);
219232
return graphStatsMap;
220233
}
234+
235+
236+
private void addRemoteIndexBuildStats(ImmutableMap.Builder<String, KNNStat<?>> builder) {
237+
builder.put(StatNames.REMOTE_VECTOR_INDEX_BUILD_STATS.getName(), new KNNStat<>(false, this::createRemoteIndexStatsMap));
238+
}
239+
240+
private Map<String, Map<String, Object>> createRemoteIndexStatsMap() {
241+
Map<String, Object> clientStatsMap = new HashMap<>();
242+
clientStatsMap.put(KNNRemoteIndexBuildValue.BUILD_REQUEST_SUCCESS_COUNT.getName(), KNNRemoteIndexBuildValue.BUILD_REQUEST_SUCCESS_COUNT.getValue());
243+
clientStatsMap.put(KNNRemoteIndexBuildValue.BUILD_REQUEST_FAILURE_COUNT.getName(), KNNRemoteIndexBuildValue.BUILD_REQUEST_FAILURE_COUNT.getValue());
244+
clientStatsMap.put(KNNRemoteIndexBuildValue.STATUS_REQUEST_SUCCESS_COUNT.getName(), KNNRemoteIndexBuildValue.STATUS_REQUEST_SUCCESS_COUNT.getValue());
245+
clientStatsMap.put(KNNRemoteIndexBuildValue.STATUS_REQUEST_FAILURE_COUNT.getName(), KNNRemoteIndexBuildValue.STATUS_REQUEST_FAILURE_COUNT.getValue());
246+
clientStatsMap.put(KNNRemoteIndexBuildValue.INDEX_BUILD_SUCCESS_COUNT.getName(), KNNRemoteIndexBuildValue.INDEX_BUILD_SUCCESS_COUNT.getValue());
247+
clientStatsMap.put(KNNRemoteIndexBuildValue.INDEX_BUILD_FAILURE_COUNT.getName(), KNNRemoteIndexBuildValue.INDEX_BUILD_FAILURE_COUNT.getValue());
248+
249+
Map<String, Object> repoStatsMap = new HashMap<>();
250+
repoStatsMap.put(KNNRemoteIndexBuildValue.WRITE_SUCCESS_COUNT.getName(), KNNRemoteIndexBuildValue.WRITE_SUCCESS_COUNT.getValue());
251+
repoStatsMap.put(KNNRemoteIndexBuildValue.WRITE_FAILURE_COUNT.getName(), KNNRemoteIndexBuildValue.WRITE_FAILURE_COUNT.getValue());
252+
repoStatsMap.put(KNNRemoteIndexBuildValue.WRITE_SIZE.getName(), KNNRemoteIndexBuildValue.WRITE_SIZE.getValue());
253+
repoStatsMap.put(KNNRemoteIndexBuildValue.WRITE_TIME.getName(), KNNRemoteIndexBuildValue.WRITE_TIME.getValue());
254+
repoStatsMap.put(KNNRemoteIndexBuildValue.READ_SUCCESS_COUNT.getName(), KNNRemoteIndexBuildValue.READ_SUCCESS_COUNT.getValue());
255+
repoStatsMap.put(KNNRemoteIndexBuildValue.READ_FAILURE_COUNT.getName(), KNNRemoteIndexBuildValue.READ_FAILURE_COUNT.getValue());
256+
repoStatsMap.put(KNNRemoteIndexBuildValue.READ_SIZE.getName(), KNNRemoteIndexBuildValue.READ_SIZE.getValue());
257+
repoStatsMap.put(KNNRemoteIndexBuildValue.READ_TIME.getName(), KNNRemoteIndexBuildValue.READ_TIME.getValue());
258+
259+
Map<String, Map<String, Object>> remoteIndexBuildStatsMap = new HashMap<>();
260+
remoteIndexBuildStatsMap.put(StatNames.REMOTE_INDEX_BUILD_SERVICE_STATS.getName(), clientStatsMap);
261+
remoteIndexBuildStatsMap.put(StatNames.REPOSITORY_STATS.getName(), repoStatsMap);
262+
263+
return remoteIndexBuildStatsMap;
264+
}
221265
}

‎src/main/java/org/opensearch/knn/plugin/stats/StatNames.java

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public enum StatNames {
4545
GRAPH_STATS("graph_stats"),
4646
REFRESH("refresh"),
4747
MERGE("merge"),
48+
REMOTE_VECTOR_INDEX_BUILD_STATS("remote_vector_index_build_stats"),
49+
REMOTE_INDEX_BUILD_SERVICE_STATS("remote_index_build_service_stats"),
50+
REPOSITORY_STATS("repository_stats"),
4851
MIN_SCORE_QUERY_REQUESTS(KNNCounter.MIN_SCORE_QUERY_REQUESTS.getName()),
4952
MIN_SCORE_QUERY_WITH_FILTER_REQUESTS(KNNCounter.MIN_SCORE_QUERY_WITH_FILTER_REQUESTS.getName()),
5053
MAX_DISTANCE_QUERY_REQUESTS(KNNCounter.MAX_DISTANCE_QUERY_REQUESTS.getName()),

0 commit comments

Comments
 (0)