diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-14 09:26:22 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-14 09:26:22 +0100 |
commit | a3fc6158428e18169ee379f405ee35181e71c443 (patch) | |
tree | 78220382451bd0dc048ca2c9148ebc435f9f8aba /config-provisioning/src | |
parent | c403f41f013ca98726b4c34a1be1c6ec5924ec7f (diff) | |
parent | e494bf9f475d72f0a6f429e73dff03560f2c659f (diff) |
Conflict resolved
Diffstat (limited to 'config-provisioning/src')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java index 77faa45ebe5..111073aca77 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Deployer.java @@ -11,8 +11,20 @@ import java.util.Optional; */ public interface Deployer { + + /** + * Creates a new deployment from the active application, if available. Will use the default timeout for deployment. + * + * @param application the active application to be redeployed + * @return a new deployment from the local active, or empty if a local active application + * was not present for this id (meaning it either is not active or active on another + * node in the config server cluster) + */ + Optional<Deployment> deployFromLocalActive(ApplicationId application); + /** - * Creates a new deployment from the active application, if available. + * Creates a new deployment from the active application, if available. Prefer {@link #deployFromLocalActive(ApplicationId)} + * if possible, this method is for testing and will override the default timeout for deployment. * * @param application the active application to be redeployed * @param timeout the timeout to use for each individual deployment operation |