wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix in timeout & header file re-arrange in DD

This commit is contained in:
sramamoorthy 2019-07-15 10:45:51 -07:00 committed by Alex Miller
parent c18558cf55
commit ddd4523816
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/NativeAPI.actor.cpp
View File

@ -3584,7 +3584,7 @@ ACTOR Future<Void> snapCreateVersion2(Database inputCx, StringRef snapCmd, UID s
try {
Future<Void> exec = snapshotDatabase(cx, snapPayloadRef, snapUID, snapUID);
double timeOut = g_network->isSimulated() ? CLIENT_KNOBS->SNAP_CREATE_TIMEOUT : 80.0;
double timeOut = g_network->isSimulated() ? 80.0 : CLIENT_KNOBS->SNAP_CREATE_TIMEOUT;
wait(timeoutError(exec, timeOut));
} catch (Error& e) {
TraceEvent("SnapshotDatabaseErrorVersion2")

26
fdbserver/DataDistribution.actor.cpp
View File

@ -18,24 +18,24 @@
* limitations under the License.
*/
#include "flow/ActorCollection.h"
#include "fdbserver/DataDistribution.actor.h"
#include "fdbclient/SystemData.h"
#include "fdbclient/DatabaseContext.h"
#include "fdbserver/MoveKeys.actor.h"
#include "fdbserver/Knobs.h"
#include <set>
#include <sstream>
#include "fdbserver/FDBExecHelper.actor.h"
#include "fdbserver/WaitFailure.h"
#include "fdbserver/ServerDBInfo.h"
#include "fdbserver/TLogInterface.h"
#include "fdbserver/IKeyValueStore.h"
#include "fdbserver/QuietDatabase.h"
#include "fdbclient/SystemData.h"
#include "fdbclient/DatabaseContext.h"
#include "fdbclient/ManagementAPI.actor.h"
#include "fdbrpc/Replication.h"
#include "flow/UnitTest.h"
#include "fdbserver/DataDistribution.actor.h"
#include "fdbserver/FDBExecHelper.actor.h"
#include "fdbserver/IKeyValueStore.h"
#include "fdbserver/Knobs.h"
#include "fdbserver/MoveKeys.actor.h"
#include "fdbserver/QuietDatabase.h"
#include "fdbserver/ServerDBInfo.h"
#include "fdbserver/TLogInterface.h"
#include "fdbserver/WaitFailure.h"
#include "flow/ActorCollection.h"
#include "flow/Trace.h"
#include "flow/UnitTest.h"
#include "flow/actorcompiler.h" // This must be the last #include.
class TCTeamInfo;