X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dss.c;h=57abf0248ad7b493248e7690a3452cc4927a8a1b;hb=56451348a0f1f106f10dccf1ea638fe2af15c597;hp=8547f24a55e6c218d76fe002f7c76baa6c81e958;hpb=25b4f1983a3804353f5fc879f93ecde978a90aaf;p=dss.git

diff --git a/dss.c b/dss.c
index 8547f24..57abf02 100644
--- a/dss.c
+++ b/dss.c
@@ -729,6 +729,7 @@ static int try_to_free_disk_space(void)
 	if (!low_disk_space)
 		goto out;
 	DSS_WARNING_LOG(("disk space low and nothing obvious to remove\n"));
+	why = "oldest";
 	victim = find_oldest_removable_snapshot(&sl);
 	if (victim)
 		goto remove;
@@ -1055,9 +1056,15 @@ static int handle_sigchld(void)
 
 static int change_to_dest_dir(void)
 {
+	int ret;
 	const char *dd = OPT_STRING_VAL(DSS, DEST_DIR);
+
 	DSS_INFO_LOG(("changing cwd to %s\n", dd));
-	return dss_chdir(dd);
+	if (chdir(dd) >= 0)
+		return 1;
+	ret = -ERRNO_TO_DSS_ERROR(errno);
+	DSS_ERROR_LOG(("could not change cwd to %s\n", dd));
+	return ret;
 }
 
 static int check_config(const struct lls_command *cmd)
@@ -1341,6 +1348,7 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 	char *logname;
 	int i = 0, j, N = OPT_GIVEN(DSS, RSYNC_OPTION);
 	struct snapshot_list sl;
+	static bool seeded;
 
 	dss_get_snapshot_list(&sl);
 	assert(!name_of_reference_snapshot);
@@ -1351,6 +1359,14 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 	(*argv)[i++] = dss_strdup("rsync");
 	(*argv)[i++] = dss_strdup("-a");
 	(*argv)[i++] = dss_strdup("--delete");
+	if (!seeded) {
+		srandom((unsigned)time(NULL)); /* no need to be fancy here */
+		seeded = true;
+	}
+	if (1000 * (random() / (RAND_MAX + 1.0)) < OPT_UINT32_VAL(DSS, CHECKSUM)) {
+		DSS_NOTICE_LOG(("adding --checksum to rsync options\n"));
+		(*argv)[i++] = dss_strdup("--checksum");
+	}
 	for (j = 0; j < N; j++)
 		(*argv)[i++] = dss_strdup(lls_string_val(j,
 			OPT_RESULT(DSS, RSYNC_OPTION)));
@@ -1681,6 +1697,13 @@ static int com_ls(void)
 }
 EXPORT_CMD_HANDLER(ls);
 
+static int com_configtest(void)
+{
+	printf("Syntax Ok\n");
+	return 0;
+}
+EXPORT_CMD_HANDLER(configtest);
+
 static int setup_signal_handling(void)
 {
 	int ret;
@@ -1722,7 +1745,7 @@ static void show_subcommand_summary(void)
 	for (i = 1; (cmd = lls_cmd(i, dss_suite)); i++) {
 		const char *name = lls_command_name(cmd);
 		const char *purpose = lls_purpose(cmd);
-		printf("%-10s%s\n", name, purpose);
+		printf("%-11s%s\n", name, purpose);
 	}
 	exit(EXIT_SUCCESS);
 }