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

Merge branch 'master' into feature/seq_no

This commit is contained in:
Boaz Leskes 2015-11-19 14:00:30 +01:00
parent d68b8101e1 bbd8eb6897
commit 1e67ef85c6
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -125,9 +125,6 @@ if (projectsPrefix.isEmpty()) {
vcs = 'Git' vcs = 'Git'
} }
} }
tasks.cleanIdea {
delete '.idea'
}
} }
// eclipse configuration // eclipse configuration

2
core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java
View File

@ -106,7 +106,7 @@ public class UnassignedInfo implements ToXContent, Writeable<UnassignedInfo> {
private final Reason reason; private final Reason reason;
private final long unassignedTimeMillis; // used for display and log messages, in milliseconds private final long unassignedTimeMillis; // used for display and log messages, in milliseconds
private final long unassignedTimeNanos; // in nanoseconds, used to calculate delay for delayed shard allocation private final long unassignedTimeNanos; // in nanoseconds, used to calculate delay for delayed shard allocation
private long lastComputedLeftDelayNanos = 0l; // how long to delay shard allocation, not serialized (always positive, 0 means no delay) private volatile long lastComputedLeftDelayNanos = 0l; // how long to delay shard allocation, not serialized (always positive, 0 means no delay)
private final String message; private final String message;
private final Throwable failure; private final Throwable failure;

2
core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java
View File

@ -196,7 +196,7 @@ public abstract class ReplicaShardAllocator extends AbstractComponent {
// calculate delay and store it in UnassignedInfo to be used by RoutingService // calculate delay and store it in UnassignedInfo to be used by RoutingService
long delay = shard.unassignedInfo().updateDelay(timeNowNanos, settings, indexMetaData.getSettings()); long delay = shard.unassignedInfo().updateDelay(timeNowNanos, settings, indexMetaData.getSettings());
if (delay > 0) { if (delay > 0) {
logger.debug("[{}][{}]: delaying allocation of [{}] for [{}]", shard.index(), shard.id(), shard, TimeValue.timeValueMillis(delay)); logger.debug("[{}][{}]: delaying allocation of [{}] for [{}]", shard.index(), shard.id(), shard, TimeValue.timeValueNanos(delay));
/** /**
* mark it as changed, since we want to kick a publishing to schedule future allocation, * mark it as changed, since we want to kick a publishing to schedule future allocation,
* see {@link org.elasticsearch.cluster.routing.RoutingService#clusterChanged(ClusterChangedEvent)}). * see {@link org.elasticsearch.cluster.routing.RoutingService#clusterChanged(ClusterChangedEvent)}).