diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-14 09:54:39 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-14 10:00:02 +0000 |
commit | 50581e22f3e4f0b74729dc814f071602ee3baa8f (patch) | |
tree | e5c82a7c053367723f23a37ac08d5d866ad77fde /filedistributionmanager | |
parent | 251c18c61ee177fa9c59b35a0ae65e2ef7ff9f3d (diff) |
Pass a regexp to pkill that matches both new and old name for
the vespa-filedistributor process.
Diffstat (limited to 'filedistributionmanager')
-rw-r--r-- | filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java b/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java index 64cdd9da416..afbc879e40f 100644 --- a/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java +++ b/filedistributionmanager/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionManager.java @@ -110,7 +110,12 @@ public class FileDistributionManager { public void reloadDeployFileDistributor() { try (LockGuard guard = new LockGuard(lock)) { - Runtime.getRuntime().exec("pkill -SIGUSR1 -x filedistributor"); + /* + * Try sending signal to vespa-filedistributor and + * filedistributor processes. Note 15 char limit for process + * name on Linux, see pkill manual page for details. + */ + Runtime.getRuntime().exec("pkill -SIGUSR1 ^(vespa-filedistr|filedistributor)$"); } catch (IOException e) { throw new RuntimeException("Failed to reinitialize the filedistributor", e); } |