aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2021-11-17 03:33:28 +1000
committeronefang2021-11-17 03:33:28 +1000
commitfd7ae05a6738377eabedeb8b2577103747f9591b (patch)
treece1a81351e852b081224f1c64faf0b9f6e96cf62
parentTiming the rsync is silly. (diff)
downloadopensim-SC-fd7ae05a6738377eabedeb8b2577103747f9591b.zip
opensim-SC-fd7ae05a6738377eabedeb8b2577103747f9591b.tar.gz
opensim-SC-fd7ae05a6738377eabedeb8b2577103747f9591b.tar.bz2
opensim-SC-fd7ae05a6738377eabedeb8b2577103747f9591b.tar.xz
Log rsync progress.
-rw-r--r--src/sledjchisl/sledjchisl.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 10b5ece..e575fc9 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -2769,9 +2769,11 @@ byTab has the short name as the key, simData as the value.
2769 sendTmuxCmd(ourSims->backup, ""); 2769 sendTmuxCmd(ourSims->backup, "");
2770 if ('\0' != rSync[0]) 2770 if ('\0' != rSync[0])
2771 { 2771 {
2772 if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 --partial --port=%d --remove-source-files %s/*.iar %s", 2772 I("%s %s is rsyncing.", sim, last);
2773 if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 -P --port=%d --remove-source-files %s/*.iar %s",
2773 rSyncPort, scBackup, rSync)) 2774 rSyncPort, scBackup, rSync))
2774 E("rsync failed"); 2775 E("rsync failed");
2776 I("%s %s is done rsyncing.", sim, last);
2775 } 2777 }
2776 ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut); 2778 ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
2777 } 2779 }
@@ -2799,9 +2801,11 @@ byTab has the short name as the key, simData as the value.
2799 sendTmuxCmd(simd->paneID, ""); 2801 sendTmuxCmd(simd->paneID, "");
2800 if ('\0' != rSync[0]) 2802 if ('\0' != rSync[0])
2801 { 2803 {
2802 if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 --partial --port=%d --remove-source-files %s/*.oar %s", 2804 I("%s is rsyncing.", simd->name);
2805 if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 -P --port=%d --remove-source-files %s/*.oar %s",
2803 rSyncPort, scBackup, rSync)) 2806 rSyncPort, scBackup, rSync))
2804 E("rsync failed"); 2807 E("rsync failed");
2808 I("%s is done rsyncing.", simd->name);
2805 } 2809 }
2806 ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut); 2810 ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
2807 } 2811 }