diff options
| author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-10-12 17:04:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 17:04:54 +0200 |
| commit | 50b3993733265a0455d78b12989c9f0391527a5d (patch) | |
| tree | 023027060d9b243c6771b5d69e1f96b15c2ec4fc /clustercontroller-apps | |
| parent | 0f2f3accdc4803781920285fa9656c820d41a20a (diff) | |
| parent | 8c6befb4a9fb5357d33208631cc15989dab771f7 (diff) | |
Merge pull request #3525 from vespa-engine/vekterli/re-enable-synchronous-set-node-state
Re-enable synchronous set node state with additional safeguards
Diffstat (limited to 'clustercontroller-apps')
| -rw-r--r-- | clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java index 0936f9d781a..8b80b0f7be5 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java @@ -10,6 +10,8 @@ import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.vespa.config.content.StorDistributionConfig; import com.yahoo.cloud.config.ZookeepersConfig; +import java.time.Duration; + /** * When the cluster controller is reconfigured, a new instance of this is created, which will propagate configured * options to receivers such as the fleet controller. @@ -70,6 +72,7 @@ public class ClusterControllerClusterConfigurer { options.maxSlobrokDisconnectGracePeriod = (int) (config.max_slobrok_disconnect_grace_period() * 1000); options.distributionBits = config.ideal_distribution_bits(); options.minNodeRatioPerGroup = config.min_node_ratio_per_group(); + options.setMaxDeferredTaskVersionWaitTime(Duration.ofMillis((int)(config.max_deferred_task_version_wait_time_sec() * 1000))); } private void configure(SlobroksConfig config) { |