* sendcommand default watchdog timeout set to 60 seconds. 5 seconds is way too low.

* ctdlmigrate overrides the default and sets it to 3600 seconds on both the source and target hosts.

diff --git a/citadel/ctdlmigrate.c b/citadel/ctdlmigrate.c
index bf82c6a6884fc73dfd18c616e592c28d4439dfe7..e0e601fbbc3661ae6b1f1fc528829d2a1cb30643 100644 (file)
--- a/citadel/ctdlmigrate.c
+++ b/citadel/ctdlmigrate.c
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
 
        printf("ctdlmigrate will now begin a database migration...\n");
 
-       snprintf(cmd, sizeof cmd, "ssh -S %s %s@%s %s MIGR export",
+       snprintf(cmd, sizeof cmd, "ssh -S %s %s@%s %s -w3600 MIGR export",
                socket_path, remote_user, remote_host, remote_sendcommand);
        source_artv = popen(cmd, "r");
        if (!source_artv) {
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
                exit(2);
        }
 
-       snprintf(cmd, sizeof cmd, "%s MIGR import", sendcommand);
+       snprintf(cmd, sizeof cmd, "%s -w3600 MIGR import", sendcommand);
        target_artv = popen(cmd, "w");
        if (!target_artv) {
                printf("\n%s\n\n", strerror(errno));

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 2f8a3cfdb86e907f135525c0c382b93d080b7f99..5012877018945538de8426e941944eb58ce1d2b6 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
        int a;
        char cmd[SIZ];
        char buf[SIZ];
-       int watchdog = 5;
+       int watchdog = 60;
 
        int relh=0;
        int home=0;