#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
#include <sys/types.h>
using std::ostream;
/* Version information. This will be filled in by the Makefile. */
-#ifndef LBS_VERSION
-#define LBS_VERSION Unknown
+#ifndef CUMULUS_VERSION
+#define CUMULUS_VERSION Unknown
#endif
-#define LBS_STRINGIFY(s) LBS_STRINGIFY2(s)
-#define LBS_STRINGIFY2(s) #s
-static const char lbs_version[] = LBS_STRINGIFY(LBS_VERSION);
+#define CUMULUS_STRINGIFY(s) CUMULUS_STRINGIFY2(s)
+#define CUMULUS_STRINGIFY2(s) #s
+static const char cumulus_version[] = CUMULUS_STRINGIFY(CUMULUS_VERSION);
static RemoteStore *remote = NULL;
static TarSegmentStore *tss = NULL;
bool relative_paths = true;
+bool flag_rebuild_statcache = false;
+
+/* Whether verbose output is enabled. */
+bool verbose = false;
+
/* Ensure that the given segment is listed as a dependency of the current
* snapshot. */
void add_segment(const string& segment)
if (found)
old_blocks = metawriter->get_blocks();
- if (found && metawriter->is_unchanged(&stat_buf)) {
+ if (found
+ && !flag_rebuild_statcache
+ && metawriter->is_unchanged(&stat_buf)) {
cached = true;
/* If any of the blocks in the object have been expired, then we should
subfile.analyze_new_block(block_buf, bytes);
refs = subfile.create_incremental(tss, o, block_age);
} else {
+ if (flag_rebuild_statcache && ref.is_normal()) {
+ subfile.analyze_new_block(block_buf, bytes);
+ subfile.store_analyzed_signatures(ref);
+ }
refs.push_back(ref);
}
file_info["checksum"] = hash.checksum_str();
}
- if (status != NULL)
+ // Sanity check: if we are rebuilding the statcache, but the file looks
+ // like it hasn't changed, then the newly-computed checksum should match
+ // the checksum in the statcache. If not, we have possible disk corruption
+ // and report a warning.
+ if (flag_rebuild_statcache) {
+ if (found
+ && metawriter->is_unchanged(&stat_buf)
+ && file_info["checksum"] != metawriter->get_checksum()) {
+ fprintf(stderr,
+ "Warning: Checksum for %s does not match expected value\n"
+ " expected: %s\n"
+ " actual: %s\n",
+ path.c_str(),
+ metawriter->get_checksum().c_str(),
+ file_info["checksum"].c_str());
+ }
+ }
+
+ if (verbose && status != NULL)
printf(" [%s]\n", status);
string blocklist = "";
int64_t file_size;
ssize_t len;
- printf("%s\n", path.c_str());
+ if (verbose)
+ printf("%s\n", path.c_str());
metawriter->find(path);
file_info["name"] = uri_encode(path);
{
fprintf(
stderr,
- "LBS %s\n\n"
+ "Cumulus %s\n\n"
"Usage: %s [OPTION]... --dest=DEST PATHS...\n"
"Produce backup snapshot of files in SOURCE and store to DEST.\n"
"\n"
" --intent=FLOAT intended backup type: 1=daily, 7=weekly, ...\n"
" (defaults to \"1\")\n"
" --full-metadata do not re-use metadata from previous backups\n"
+ " --rebuild-statcache re-read all file data to verify statcache\n"
+ " -v --verbose list files as they are backed up\n"
"\n"
"Exactly one of --dest or --upload-script must be specified.\n",
- lbs_version, program
+ cumulus_version, program
);
}
{"full-metadata", 0, 0, 0}, // 8
{"tmpdir", 1, 0, 0}, // 9
{"upload-script", 1, 0, 0}, // 10
+ {"rebuild-statcache", 0, 0, 0}, // 11
+ // Aliases for short options
+ {"verbose", 0, 0, 'v'},
{NULL, 0, 0, 0},
};
int long_index;
- int c = getopt_long(argc, argv, "", long_options, &long_index);
+ int c = getopt_long(argc, argv, "v", long_options, &long_index);
if (c == -1)
break;
case 10: // --upload-script
backup_script = optarg;
break;
+ case 11: // --rebuild-statcache
+ flag_rebuild_statcache = true;
+ break;
default:
fprintf(stderr, "Unhandled long option!\n");
return 1;
}
} else {
- usage(argv[0]);
- return 1;
+ switch (c) {
+ case 'v':
+ verbose = true;
+ break;
+ default:
+ usage(argv[0]);
+ return 1;
+ }
}
}
}
}
fclose(checksums);
+
+ SHA1Checksum checksum_csum;
+ string csum;
+ checksum_filename = checksum_file->get_local_path();
+ if (checksum_csum.process_file(checksum_filename.c_str())) {
+ csum = checksum_csum.checksum_str();
+ }
+
checksum_file->send();
db->Close();
}
FILE *descriptor = fdopen(descriptor_fd, "w");
- fprintf(descriptor, "Format: LBS Snapshot v0.6\n");
- fprintf(descriptor, "Producer: LBS %s\n", lbs_version);
+ fprintf(descriptor, "Format: LBS Snapshot v0.8\n");
+ fprintf(descriptor, "Producer: Cumulus %s\n", cumulus_version);
strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf);
fprintf(descriptor, "Date: %s\n", desc_buf);
if (backup_scheme.size() > 0)
fprintf(descriptor, "Backup-Intent: %g\n", snapshot_intent);
fprintf(descriptor, "Root: %s\n", backup_root.c_str());
- SHA1Checksum checksum_csum;
- if (checksum_csum.process_file(checksum_filename.c_str())) {
- string csum = checksum_csum.checksum_str();
+ if (csum.size() > 0) {
fprintf(descriptor, "Checksums: %s\n", csum.c_str());
}