honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add progress to indices status API

This commit is contained in:
kimchy 2010-08-19 22:29:31 +03:00
parent 8d0e5b239c
commit 7437acfcea
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/GatewayRecoveryStatus.java
View File

@ -169,6 +169,17 @@ public class GatewayRecoveryStatus {
return recoveredIndexSize();
}
public int indexRecoveryProgress() {
if (recoveredIndexSize == 0) {
return 0;
}
return (int) (((double) recoveredIndexSize) / expectedRecoveredIndexSize().bytes() * 100);
}
public int getIndexRecoveryProgress() {
return indexRecoveryProgress();
}
public long recoveredTranslogOperations() {
return recoveredTranslogOperations;
}

11
modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/PeerRecoveryStatus.java
View File

@ -158,6 +158,17 @@ public class PeerRecoveryStatus {
return recoveredIndexSize();
}
public int indexRecoveryProgress() {
if (recoveredIndexSize == 0) {
return 0;
}
return (int) (((double) recoveredIndexSize) / expectedRecoveredIndexSize().bytes() * 100);
}
public int getIndexRecoveryProgress() {
return indexRecoveryProgress();
}
public long recoveredTranslogOperations() {
return recoveredTranslogOperations;
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java
View File

@ -138,7 +138,7 @@ public class TransportIndicesStatusAction extends TransportBroadcastOperationAct
@Override protected ShardStatus shardOperation(IndexShardStatusRequest request) throws ElasticSearchException {
InternalIndexService indexService = (InternalIndexService) indicesService.indexServiceSafe(request.index());
InternalIndexShard indexShard = (InternalIndexShard) indexService.shard(request.shardId());
InternalIndexShard indexShard = (InternalIndexShard) indexService.shardSafe(request.shardId());
ShardStatus shardStatus = new ShardStatus(indexShard.routingEntry());
shardStatus.state = indexShard.state();
try {

2
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java
View File

@ -149,6 +149,7 @@ public class RestIndicesStatusAction extends BaseRestHandler {
builder.field("throttling_time_in_millis", peerRecoveryStatus.throttlingTime().millis());
builder.startObject("index");
builder.field("progress", peerRecoveryStatus.indexRecoveryProgress());
builder.field("size", peerRecoveryStatus.indexSize());
builder.field("size_in_bytes", peerRecoveryStatus.indexSize().bytes());
builder.field("reused_size", peerRecoveryStatus.reusedIndexSize());
@ -177,6 +178,7 @@ public class RestIndicesStatusAction extends BaseRestHandler {
builder.field("throttling_time_in_millis", gatewayRecoveryStatus.throttlingTime().millis());
builder.startObject("index");
builder.field("progress", gatewayRecoveryStatus.indexRecoveryProgress());
builder.field("size", gatewayRecoveryStatus.indexSize());
builder.field("size_in_bytes", gatewayRecoveryStatus.indexSize().bytes());
builder.field("reused_size", gatewayRecoveryStatus.reusedIndexSize());