Merge pull request #2759 from yahoo/toregge/send-signal-to-vespa-filedistributor-too

Pass a regexp to pkill that matches both new and old name for

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);
         }