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

Merge pull request #10349 from DavidWittman/typo-recovery-after-time 

Fix typos for gateway.recover_after_time
This commit is contained in:
Boaz Leskes 2015-03-31 22:03:04 +02:00
parent 9c1c335d02 3acf4ccb33
commit 54bfe53d51
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/modules/gateway.asciidoc
View File

@ -43,7 +43,7 @@ once all `gateway.recover_after...nodes` conditions are met.
The `gateway.expected_nodes` allows to set how many data and master
eligible nodes are expected to be in the cluster, and once met, the
`gateway.recover_after_time` is ignored and recovery starts.
Setting `gateway.expected_nodes` also defaults `gateway.recovery_after_time` to `5m` The `gateway.expected_data_nodes` and `gateway.expected_master_nodes`
Setting `gateway.expected_nodes` also defaults `gateway.recover_after_time` to `5m` The `gateway.expected_data_nodes` and `gateway.expected_master_nodes`
settings are also supported. For example setting:
[source,js]

4
src/main/java/org/elasticsearch/gateway/GatewayService.java
View File

@ -151,7 +151,7 @@ public class GatewayService extends AbstractLifecycleComponent<GatewayService> i
if (expectedNodes == -1 && expectedMasterNodes == -1 && expectedDataNodes == -1) {
// no expected is set, honor the setting if they are there
enforceRecoverAfterTime = true;
reason = "recovery_after_time was set to [" + recoverAfterTime + "]";
reason = "recover_after_time was set to [" + recoverAfterTime + "]";
} else {
// one of the expected is set, see if all of them meet the need, and ignore the timeout in this case
enforceRecoverAfterTime = false;
@ -181,7 +181,7 @@ public class GatewayService extends AbstractLifecycleComponent<GatewayService> i
@Override
public void run() {
if (recovered.compareAndSet(false, true)) {
logger.info("recovery_after_time [{}] elapsed. performing state recovery...", recoverAfterTime);
logger.info("recover_after_time [{}] elapsed. performing state recovery...", recoverAfterTime);
gateway.performStateRecovery(recoveryListener);
}
}