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

Merge branch 'release-5.1' into release-5.2

This commit is contained in:
Evan Tschannen 2018-05-08 13:08:11 -07:00
parent 2e41cea6dc 56f705682f
commit 1f6c6a886b
9 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FDBLibTLS/local.mk
View File

@ -5,7 +5,7 @@ FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDB
# The plugin isn't a typical library, so it feels more sensible to have a copy # The plugin isn't a typical library, so it feels more sensible to have a copy
# of it in bin/. # of it in bin/.
bin/FDBLibTLS.$(DLEXT): lib/libFDBLibTLS.$(DLEXT) bin/fdb-libressl-plugin.$(DLEXT): lib/libFDBLibTLS.$(DLEXT)
@cp $< $@ @cp $< $@
TARGETS += bin/FDBLibTLS.$(DLEXT) TARGETS += bin/fdb-libressl-plugin.$(DLEXT)

3
bindings/c/test/performance_test.c
View File

@ -44,7 +44,6 @@ fdb_error_t waitError(FDBFuture *f) {
struct RunResult run(struct ResultSet *rs, FDBDatabase *db, struct RunResult (*func)(struct ResultSet*, FDBTransaction*)) { struct RunResult run(struct ResultSet *rs, FDBDatabase *db, struct RunResult (*func)(struct ResultSet*, FDBTransaction*)) {
FDBTransaction *tr = NULL; FDBTransaction *tr = NULL;
checkError(fdb_database_create_transaction(db, &tr), "create transaction", rs);
fdb_error_t e = fdb_database_create_transaction(db, &tr); fdb_error_t e = fdb_database_create_transaction(db, &tr);
checkError(e, "create transaction", rs); checkError(e, "create transaction", rs);
@ -62,9 +61,11 @@ struct RunResult run(struct ResultSet *rs, FDBDatabase *db, struct RunResult (*f
fdb_error_t retryE = waitError(f); fdb_error_t retryE = waitError(f);
fdb_future_destroy(f); fdb_future_destroy(f);
if (retryE) { if (retryE) {
fdb_transaction_destroy(tr);
return (struct RunResult) {0, retryE}; return (struct RunResult) {0, retryE};
} }
} else { } else {
fdb_transaction_destroy(tr);
return r; return r;
} }
} }

1
bindings/c/test/ryw_benchmark.c
View File

@ -236,6 +236,7 @@ void runTests(struct ResultSet *rs) {
runTest(&clearRangeGetRange, tr, rs, "C: get range cached values with clear ranges throughput"); runTest(&clearRangeGetRange, tr, rs, "C: get range cached values with clear ranges throughput");
runTest(&interleavedSetsGets, tr, rs, "C: interleaved sets and gets on a single key throughput"); runTest(&interleavedSetsGets, tr, rs, "C: interleaved sets and gets on a single key throughput");
fdb_transaction_destroy(tr);
fdb_database_destroy(db); fdb_database_destroy(db);
fdb_stop_network(); fdb_stop_network();
} }

2
build/packages.mk
View File

@ -121,7 +121,7 @@ ifeq ($(PLATFORM),linux)
@rm -f packages/foundationdb-server-*.rpm packages/foundationdb-clients-*.rpm @rm -f packages/foundationdb-server-*.rpm packages/foundationdb-clients-*.rpm
@packaging/rpm/buildrpms.sh $(VERSION) $(PKGRELEASE) @packaging/rpm/buildrpms.sh $(VERSION) $(PKGRELEASE)
FDBTLS: bin/FDBLibTLS.$(DLEXT) FDBTLS: bin/fdb-libressl-plugin.$(DLEXT)
packages: DEB RPM JAVA_RELEASE FDBTESTS FDBHEADERS FDBTLS packages: DEB RPM JAVA_RELEASE FDBTESTS FDBHEADERS FDBTLS

14
documentation/sphinx/source/tls.rst
View File

@ -79,9 +79,9 @@ Plugin default location
Similarly, if a value is not specified for the parameter ``tls_plugin``, the file will be specified by the environment variable ``FDB_TLS_PLUGIN`` or, if this variable is not set, the system-dependent location: Similarly, if a value is not specified for the parameter ``tls_plugin``, the file will be specified by the environment variable ``FDB_TLS_PLUGIN`` or, if this variable is not set, the system-dependent location:
* Linux: ``/usr/lib/foundationdb/plugins/FDBLibTLS.so`` * Linux: ``/usr/lib/foundationdb/plugins/fdb-libressl-plugin.so``
* macOS: ``/usr/local/foundationdb/plugins/FDBLibTLS.dylib`` * macOS: ``/usr/local/foundationdb/plugins/fdb-libressl-plugin.dylib``
* Windows: ``C:\Program Files\foundationdb\plugins\FDBLibTLS.dll`` * Windows: ``C:\Program Files\foundationdb\plugins\fdb-libressl-plugin.dll``
On Windows, this location will be relative to the chosen installation location. The environment variable ``FOUNDATIONDB_INSTALL_PATH`` will be used in place of ``C:\Program Files\foundationdb\`` to determine this location. On Windows, this location will be relative to the chosen installation location. The environment variable ``FOUNDATIONDB_INSTALL_PATH`` will be used in place of ``C:\Program Files\foundationdb\`` to determine this location.
@ -183,11 +183,11 @@ If the default checking of the certificate chain is too stringent, the verificat
===================== ============================================================= ===================== =============================================================
Setting Result Setting Result
===================== ============================================================= ===================== =============================================================
``Check.Valid=0`` Sets the current process to disable all further verification ``Check.Valid=0`` Sets the current process to disable all further verification
of a peer certificate. of a peer certificate.
``Check.Unexpired=0`` Disables date checking of peer certificates. If the clocks in ``Check.Unexpired=0`` Disables date checking of peer certificates. If the clocks in
the cluster and between the clients and servers are not to be the cluster and between the clients and servers are not to be
trusted, setting this value to ``0`` can allow communications trusted, setting this value to ``0`` can allow communications
to proceed. to proceed.
===================== ============================================================= ===================== =============================================================

2
fdbclient/vexillographer/fdb.options
View File

@ -142,6 +142,8 @@ description is not currently required but encouraged.
description="Deprecated" /> description="Deprecated" />
<Option name="durability_datacenter" code="110" /> <Option name="durability_datacenter" code="110" />
<Option name="durability_risky" code="120" /> <Option name="durability_risky" code="120" />
<Option name="durability_dev_null_is_web_scale" code="130"
description="Deprecated"/>
<Option name="priority_system_immediate" code="200" <Option name="priority_system_immediate" code="200"
description="Specifies that this transaction should be treated as highest priority and that lower priority transactions should block behind this one. Use is discouraged outside of low-level tools" /> description="Specifies that this transaction should be treated as highest priority and that lower priority transactions should block behind this one. Use is discouraged outside of low-level tools" />
<Option name="priority_batch" code="201" <Option name="priority_batch" code="201"

2
fdbmonitor/fdbmonitor.cpp
View File

@ -615,7 +615,7 @@ void print_usage(const char* name) {
" fdbmonitor. The default is `/var/run/fdbmonitor.pid'.\n" " fdbmonitor. The default is `/var/run/fdbmonitor.pid'.\n"
" --loggroup LOGGROUP\n" " --loggroup LOGGROUP\n"
" Sets the 'LogGroup' field with the specified value for all\n" " Sets the 'LogGroup' field with the specified value for all\n"
" entries in the log output. The default log group is 'default'." " entries in the log output. The default log group is 'default'.\n"
" --daemonize Background the fdbmonitor process.\n" " --daemonize Background the fdbmonitor process.\n"
" -h, --help Display this help and exit.\n", name); " -h, --help Display this help and exit.\n", name);
} }

2
fdbrpc/TLSConnection.actor.cpp
View File

@ -307,7 +307,7 @@ void TLSOptions::init_plugin( std::string const& plugin_path ) {
} else { } else {
if ( !platform::getEnvironmentVar( "FDB_TLS_PLUGIN", path ) ) if ( !platform::getEnvironmentVar( "FDB_TLS_PLUGIN", path ) )
// FIXME: should there be other fallbacks? // FIXME: should there be other fallbacks?
path = platform::getDefaultPluginPath("FDBGnuTLS"); path = platform::getDefaultPluginPath("fdb-libressl-plugin");
} }
TraceEvent("TLSConnectionLoadingPlugin").detail("PluginPath", path); TraceEvent("TLSConnectionLoadingPlugin").detail("PluginPath", path);

4
fdbserver/Ratekeeper.actor.cpp
View File

@ -90,7 +90,7 @@ struct StorageQueueInfo {
smoothDurableVersion(1.), smoothLatestVersion(1.), smoothFreeSpace(SERVER_KNOBS->SMOOTHING_AMOUNT), smoothDurableVersion(1.), smoothLatestVersion(1.), smoothFreeSpace(SERVER_KNOBS->SMOOTHING_AMOUNT),
smoothTotalSpace(SERVER_KNOBS->SMOOTHING_AMOUNT), limitReason(limitReason_t::unlimited) smoothTotalSpace(SERVER_KNOBS->SMOOTHING_AMOUNT), limitReason(limitReason_t::unlimited)
{ {
// FIXME: this is a tacky workaround for a potential unitialized use in trackStorageServerQueueInfo // FIXME: this is a tacky workaround for a potential uninitialized use in trackStorageServerQueueInfo
lastReply.instanceID = -1; lastReply.instanceID = -1;
} }
}; };
@ -106,7 +106,7 @@ struct TLogQueueInfo {
TLogQueueInfo(UID id) : valid(false), id(id), smoothDurableBytes(SERVER_KNOBS->SMOOTHING_AMOUNT), smoothInputBytes(SERVER_KNOBS->SMOOTHING_AMOUNT), TLogQueueInfo(UID id) : valid(false), id(id), smoothDurableBytes(SERVER_KNOBS->SMOOTHING_AMOUNT), smoothInputBytes(SERVER_KNOBS->SMOOTHING_AMOUNT),
verySmoothDurableBytes(SERVER_KNOBS->SLOW_SMOOTHING_AMOUNT), smoothFreeSpace(SERVER_KNOBS->SMOOTHING_AMOUNT), verySmoothDurableBytes(SERVER_KNOBS->SLOW_SMOOTHING_AMOUNT), smoothFreeSpace(SERVER_KNOBS->SMOOTHING_AMOUNT),
smoothTotalSpace(SERVER_KNOBS->SMOOTHING_AMOUNT) { smoothTotalSpace(SERVER_KNOBS->SMOOTHING_AMOUNT) {
// FIXME: this is a tacky workaround for a potential unitialized use in trackTLogQueueInfo (copied from storageQueueInfO) // FIXME: this is a tacky workaround for a potential uninitialized use in trackTLogQueueInfo (copied from storageQueueInfO)
lastReply.instanceID = -1; lastReply.instanceID = -1;
} }
}; };