apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-02 03:12:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3287 from jzhou77/backup-cmd

Browse Source 
Set up blob credentials for backup workers
This commit is contained in:
Meng Xu 2020-06-11 21:04:52 -07:00 committed by GitHub
commit cc10aef548
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbbackup/backup.actor.cpp
View File

@ -955,7 +955,7 @@ static void printBackupUsage(bool devhelp) {
printf(" -e ERRORLIMIT The maximum number of errors printed by status (default is 10).\n"); printf(" -e ERRORLIMIT The maximum number of errors printed by status (default is 10).\n");
printf(" -k KEYS List of key ranges to backup.\n" printf(" -k KEYS List of key ranges to backup.\n"
" If not specified, the entire database will be backed up.\n"); " If not specified, the entire database will be backed up.\n");
printf(" -p, --partitioned_log Starts with new type of backup system using partitioned logs.\n"); printf(" --partitioned_log_experimental Starts with new type of backup system using partitioned logs.\n");
printf(" -n, --dryrun For backup start or restore start, performs a trial run with no actual changes made.\n"); printf(" -n, --dryrun For backup start or restore start, performs a trial run with no actual changes made.\n");
printf(" --log Enables trace file logging for the CLI session.\n" printf(" --log Enables trace file logging for the CLI session.\n"
" --logdir PATH Specifes the output directory for trace files. If\n" " --logdir PATH Specifes the output directory for trace files. If\n"

21
fdbserver/fdbserver.actor.cpp
View File

@ -941,7 +941,7 @@ struct CLIOptions {
double fileIoTimeout = 0.0; double fileIoTimeout = 0.0;
bool fileIoWarnOnly = false; bool fileIoWarnOnly = false;
uint64_t rsssize = -1; uint64_t rsssize = -1;
std::vector<std::string> blobCredentials; // used for fast restore workers std::vector<std::string> blobCredentials; // used for fast restore workers & backup workers
const char* blobCredsFromENV = nullptr; const char* blobCredsFromENV = nullptr;
Reference<ClusterConnectionFile> connectionFile; Reference<ClusterConnectionFile> connectionFile;
@ -1846,6 +1846,16 @@ int main(int argc, char* argv[]) {
setupAndRun(dataFolder, opts.testFile, opts.restarting, (isRestoring >= 1), opts.whitelistBinPaths); setupAndRun(dataFolder, opts.testFile, opts.restarting, (isRestoring >= 1), opts.whitelistBinPaths);
g_simulator.run(); g_simulator.run();
} else if (role == FDBD) { } else if (role == FDBD) {
// Update the global blob credential files list so that both fast
// restore workers and backup workers can access blob storage.
std::vector<std::string>* pFiles =
(std::vector<std::string>*)g_network->global(INetwork::enBlobCredentialFiles);
if (pFiles != nullptr) {
for (auto& f : opts.blobCredentials) {
pFiles->push_back(f);
}
}
// Call fast restore for the class FastRestoreClass. This is a short-cut to run fast restore in circus // Call fast restore for the class FastRestoreClass. This is a short-cut to run fast restore in circus
if (opts.processClass == ProcessClass::FastRestoreClass) { if (opts.processClass == ProcessClass::FastRestoreClass) {
printf("Run as fast restore worker\n"); printf("Run as fast restore worker\n");
@ -1854,15 +1864,6 @@ int main(int argc, char* argv[]) {
if (!dataFolder.size()) if (!dataFolder.size())
dataFolder = format("fdb/%d/", opts.publicAddresses.address.port); // SOMEDAY: Better default dataFolder = format("fdb/%d/", opts.publicAddresses.address.port); // SOMEDAY: Better default
// Update the global blob credential files list
std::vector<std::string>* pFiles =
(std::vector<std::string>*)g_network->global(INetwork::enBlobCredentialFiles);
if (pFiles != nullptr) {
for (auto& f : opts.blobCredentials) {
pFiles->push_back(f);
}
}
vector<Future<Void>> actors(listenErrors.begin(), listenErrors.end()); vector<Future<Void>> actors(listenErrors.begin(), listenErrors.end());
actors.push_back(restoreWorker(opts.connectionFile, opts.localities, dataFolder)); actors.push_back(restoreWorker(opts.connectionFile, opts.localities, dataFolder));
f = stopAfter(waitForAll(actors)); f = stopAfter(waitForAll(actors));