Skip to content

Commit

Permalink
Removed unused loggers and updated upload stats field names
Browse files Browse the repository at this point in the history 
Signed-off-by: Shourya Dutta Biswas <[email protected]>
  • Loading branch information
@shourya035
shourya035 committed Jul 5, 2023
1 parent 8086eb9 commit 97b733a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 38 deletions.
32 changes: 13 additions & 19 deletions ...src/main/java/org/opensearch/action/admin/cluster/remotestore/stats/RemoteStoreStats.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@

package org.opensearch.action.admin.cluster.remotestore.stats;

import org.apache.logging.log4j.Logger;
import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.common.Strings;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.common.logging.Loggers;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.xcontent.ToXContentFragment;
import org.opensearch.core.xcontent.XContentBuilder;
Expand All @@ -33,18 +31,14 @@ public class RemoteStoreStats implements Writeable, ToXContentFragment {

private final ShardRouting currentRouting;

private final Logger logger;

public RemoteStoreStats(RemoteRefreshSegmentTracker.Stats remoteSegmentUploadShardStats, ShardRouting currentRouting) {
this.remoteSegmentShardStats = remoteSegmentUploadShardStats;
this.currentRouting = currentRouting;
this.logger = Loggers.getLogger(getClass(), this.currentRouting.getIndexName());
}

public RemoteStoreStats(StreamInput in) throws IOException {
this.remoteSegmentShardStats = in.readOptionalWriteable(RemoteRefreshSegmentTracker.Stats::new);
this.currentRouting = new ShardRouting(in);
this.logger = Loggers.getLogger(getClass(), this.currentRouting.getIndexName());
}

public RemoteRefreshSegmentTracker.Stats getStats() {
Expand Down Expand Up @@ -94,31 +88,31 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
}
if (currentRouting.primary()) {
builder.startObject(SubFields.UPLOAD)
.field(UploadFields.LOCAL_REFRESH_TIMESTAMP, remoteSegmentShardStats.localRefreshClockTimeMs)
.field(UploadFields.REMOTE_REFRESH_TIMESTAMP, remoteSegmentShardStats.remoteRefreshClockTimeMs)
.field(UploadFields.REFRESH_TIME_LAG_IN_MILLIS, remoteSegmentShardStats.refreshTimeLagMs)
.field(UploadFields.REFRESH_LAG, remoteSegmentShardStats.localRefreshNumber - remoteSegmentShardStats.remoteRefreshNumber)
.field(UploadFields.BYTES_LAG, remoteSegmentShardStats.bytesLag)
.field(UploadFields.BACKPRESSURE_REJECTION_COUNT, remoteSegmentShardStats.rejectionCount)
.field(UploadFields.CONSECUTIVE_FAILURE_COUNT, remoteSegmentShardStats.consecutiveFailuresCount);
builder.startObject(UploadFields.TOTAL_REMOTE_REFRESH)
.field(UploadStatsFields.LOCAL_REFRESH_TIMESTAMP, remoteSegmentShardStats.localRefreshClockTimeMs)
.field(UploadStatsFields.REMOTE_REFRESH_TIMESTAMP, remoteSegmentShardStats.remoteRefreshClockTimeMs)
.field(UploadStatsFields.REFRESH_TIME_LAG_IN_MILLIS, remoteSegmentShardStats.refreshTimeLagMs)
.field(UploadStatsFields.REFRESH_LAG, remoteSegmentShardStats.localRefreshNumber - remoteSegmentShardStats.remoteRefreshNumber)
.field(UploadStatsFields.BYTES_LAG, remoteSegmentShardStats.bytesLag)
.field(UploadStatsFields.BACKPRESSURE_REJECTION_COUNT, remoteSegmentShardStats.rejectionCount)
.field(UploadStatsFields.CONSECUTIVE_FAILURE_COUNT, remoteSegmentShardStats.consecutiveFailuresCount);
builder.startObject(UploadStatsFields.TOTAL_REMOTE_REFRESH)
.field(SubFields.STARTED, remoteSegmentShardStats.totalUploadsStarted)
.field(SubFields.SUCCEEDED, remoteSegmentShardStats.totalUploadsSucceeded)
.field(SubFields.FAILED, remoteSegmentShardStats.totalUploadsFailed);
builder.endObject();
builder.startObject(UploadFields.TOTAL_UPLOADS_IN_BYTES)
builder.startObject(UploadStatsFields.TOTAL_UPLOADS_IN_BYTES)
.field(SubFields.STARTED, remoteSegmentShardStats.uploadBytesStarted)
.field(SubFields.SUCCEEDED, remoteSegmentShardStats.uploadBytesSucceeded)
.field(SubFields.FAILED, remoteSegmentShardStats.uploadBytesFailed);
builder.endObject();
builder.startObject(UploadFields.REMOTE_REFRESH_SIZE_IN_BYTES)
builder.startObject(UploadStatsFields.REMOTE_REFRESH_SIZE_IN_BYTES)
.field(SubFields.LAST_SUCCESSFUL, remoteSegmentShardStats.lastSuccessfulRemoteRefreshBytes)
.field(SubFields.MOVING_AVG, remoteSegmentShardStats.uploadBytesMovingAverage);
builder.endObject();
builder.startObject(UploadFields.UPLOAD_LATENCY_IN_BYTES_PER_SEC)
builder.startObject(UploadStatsFields.UPLOAD_LATENCY_IN_BYTES_PER_SEC)
.field(SubFields.MOVING_AVG, remoteSegmentShardStats.uploadBytesPerSecMovingAverage);
builder.endObject();
builder.startObject(UploadFields.REMOTE_REFRESH_LATENCY_IN_MILLIS)
builder.startObject(UploadStatsFields.REMOTE_REFRESH_LATENCY_IN_MILLIS)
.field(SubFields.MOVING_AVG, remoteSegmentShardStats.uploadTimeMovingAverage);
builder.endObject();
builder.endObject();
Expand Down Expand Up @@ -155,7 +149,7 @@ static final class RoutingFields {
/**
* Fields for remote store stats response
*/
static final class UploadFields {
static final class UploadStatsFields {
static final String SHARD_ID = "shard_id";

/**
Expand Down
36 changes: 17 additions & 19 deletions ...ava/org/opensearch/action/admin/cluster/remotestore/stats/RemoteStoreStatsTestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

package org.opensearch.action.admin.cluster.remotestore.stats;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.cluster.routing.ShardRoutingState;
import org.opensearch.cluster.routing.TestShardRouting;
Expand Down Expand Up @@ -103,59 +101,59 @@ static void compareStatsResponse(Map<String, Object> statsObject, RemoteRefreshS
assertTrue(segmentUploads.isEmpty());
} else {
assertTrue(segmentDownloads.isEmpty());
assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.LOCAL_REFRESH_TIMESTAMP),
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.LOCAL_REFRESH_TIMESTAMP),
(int) pressureTrackerStats.localRefreshClockTimeMs
);
assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.REMOTE_REFRESH_TIMESTAMP),
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.REMOTE_REFRESH_TIMESTAMP),
(int) pressureTrackerStats.remoteRefreshClockTimeMs
);
assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.REFRESH_TIME_LAG_IN_MILLIS),
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.REFRESH_TIME_LAG_IN_MILLIS),
(int) pressureTrackerStats.refreshTimeLagMs
);
assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.REFRESH_LAG),
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.REFRESH_LAG),
(int) (pressureTrackerStats.localRefreshNumber - pressureTrackerStats.remoteRefreshNumber)
);
assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.BYTES_LAG), (int) pressureTrackerStats.bytesLag);
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.BYTES_LAG), (int) pressureTrackerStats.bytesLag);

assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.BACKPRESSURE_REJECTION_COUNT),
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.BACKPRESSURE_REJECTION_COUNT),
(int) pressureTrackerStats.rejectionCount
);
assertEquals(segmentUploads.get(RemoteStoreStats.UploadFields.CONSECUTIVE_FAILURE_COUNT),
assertEquals(segmentUploads.get(RemoteStoreStats.UploadStatsFields.CONSECUTIVE_FAILURE_COUNT),
(int) pressureTrackerStats.consecutiveFailuresCount
);
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadFields.TOTAL_UPLOADS_IN_BYTES)).get(RemoteStoreStats.SubFields.STARTED),
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.TOTAL_UPLOADS_IN_BYTES)).get(RemoteStoreStats.SubFields.STARTED),
(int) pressureTrackerStats.uploadBytesStarted
);
assertEquals(
((Map) segmentUploads.get(RemoteStoreStats.UploadFields.TOTAL_UPLOADS_IN_BYTES)).get(RemoteStoreStats.SubFields.SUCCEEDED),
((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.TOTAL_UPLOADS_IN_BYTES)).get(RemoteStoreStats.SubFields.SUCCEEDED),
(int) pressureTrackerStats.uploadBytesSucceeded
);
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadFields.TOTAL_UPLOADS_IN_BYTES)).get(RemoteStoreStats.SubFields.FAILED),
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.TOTAL_UPLOADS_IN_BYTES)).get(RemoteStoreStats.SubFields.FAILED),
(int) pressureTrackerStats.uploadBytesFailed
);
assertEquals(
((Map) segmentUploads.get(RemoteStoreStats.UploadFields.REMOTE_REFRESH_SIZE_IN_BYTES)).get(RemoteStoreStats.SubFields.MOVING_AVG),
((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.REMOTE_REFRESH_SIZE_IN_BYTES)).get(RemoteStoreStats.SubFields.MOVING_AVG),
pressureTrackerStats.uploadBytesMovingAverage
);
assertEquals(
((Map) segmentUploads.get(RemoteStoreStats.UploadFields.REMOTE_REFRESH_SIZE_IN_BYTES)).get(RemoteStoreStats.SubFields.LAST_SUCCESSFUL),
((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.REMOTE_REFRESH_SIZE_IN_BYTES)).get(RemoteStoreStats.SubFields.LAST_SUCCESSFUL),
(int) pressureTrackerStats.lastSuccessfulRemoteRefreshBytes
);
assertEquals(
((Map) segmentUploads.get(RemoteStoreStats.UploadFields.UPLOAD_LATENCY_IN_BYTES_PER_SEC)).get(RemoteStoreStats.SubFields.MOVING_AVG),
((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.UPLOAD_LATENCY_IN_BYTES_PER_SEC)).get(RemoteStoreStats.SubFields.MOVING_AVG),
pressureTrackerStats.uploadBytesPerSecMovingAverage
);
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadFields.TOTAL_REMOTE_REFRESH)).get(RemoteStoreStats.SubFields.STARTED),
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.TOTAL_REMOTE_REFRESH)).get(RemoteStoreStats.SubFields.STARTED),
(int) pressureTrackerStats.totalUploadsStarted
);
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadFields.TOTAL_REMOTE_REFRESH)).get(RemoteStoreStats.SubFields.SUCCEEDED),
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.TOTAL_REMOTE_REFRESH)).get(RemoteStoreStats.SubFields.SUCCEEDED),
(int) pressureTrackerStats.totalUploadsSucceeded
);
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadFields.TOTAL_REMOTE_REFRESH)).get(RemoteStoreStats.SubFields.FAILED),
assertEquals(((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.TOTAL_REMOTE_REFRESH)).get(RemoteStoreStats.SubFields.FAILED),
(int) pressureTrackerStats.totalUploadsFailed
);
assertEquals(
((Map) segmentUploads.get(RemoteStoreStats.UploadFields.REMOTE_REFRESH_LATENCY_IN_MILLIS)).get(RemoteStoreStats.SubFields.MOVING_AVG),
((Map) segmentUploads.get(RemoteStoreStats.UploadStatsFields.REMOTE_REFRESH_LATENCY_IN_MILLIS)).get(RemoteStoreStats.SubFields.MOVING_AVG),
pressureTrackerStats.uploadTimeMovingAverage
);
}
Expand Down

0 comments on commit 97b733a

Please sign in to comment.