From 5e3269e7d21a6651c9b450360de3ec061b57d9dc Mon Sep 17 00:00:00 2001 From: Alvin Moore Date: Tue, 10 Apr 2018 13:17:18 -0700 Subject: [PATCH 1/8] Added the resources back into the mac package --- packaging/osx/buildpkg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/osx/buildpkg.sh b/packaging/osx/buildpkg.sh index 7109810078..60b441b191 100755 --- a/packaging/osx/buildpkg.sh +++ b/packaging/osx/buildpkg.sh @@ -54,6 +54,6 @@ pkgbuild --root $SERVERDIR --identifier FoundationDB-server --version $VERSION.$ rm -rf $SERVERDIR -productbuild --distribution packaging/osx/Distribution.xml --package-path . $PKGFILE +productbuild --distribution packaging/osx/Distribution.xml --resources packaging/osx/resources --package-path . $PKGFILE rm FoundationDB-clients.pkg FoundationDB-server.pkg From 9bd6c41924d3c8bef11f7df5dce9d7af43645c91 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Wed, 11 Apr 2018 10:53:09 -0700 Subject: [PATCH 2/8] added release notes for 5.1.5 --- documentation/sphinx/source/release-notes.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/documentation/sphinx/source/release-notes.rst b/documentation/sphinx/source/release-notes.rst index 479c104469..65c2e901f6 100644 --- a/documentation/sphinx/source/release-notes.rst +++ b/documentation/sphinx/source/release-notes.rst @@ -2,6 +2,21 @@ Release Notes ############# +5.1.5 +===== + +Fixes +----- + +* The consistency check calculated the size of the database inefficiently. +* Could not create new directories with the Python and Ruby implementations of the directory layer. + + +Other Changes +------------- + +* renamed the ``multi_dc`` replication mode to ``three_datacenter``. + 5.1.4 ===== From ee4c96613701c49f995f8472a2a8eb2185b4cdfc Mon Sep 17 00:00:00 2001 From: "A.J. Beamon" Date: Wed, 11 Apr 2018 11:15:12 -0700 Subject: [PATCH 3/8] TransportData::numIncompatibleConnections was uninitialized. --- fdbrpc/FlowTransport.actor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fdbrpc/FlowTransport.actor.cpp b/fdbrpc/FlowTransport.actor.cpp index edeaef5f8f..2432934eff 100644 --- a/fdbrpc/FlowTransport.actor.cpp +++ b/fdbrpc/FlowTransport.actor.cpp @@ -144,7 +144,8 @@ public: pingReceiver(endpoints), warnAlwaysForLargePacket(true), lastIncompatibleMessage(0), - transportId(transportId) + transportId(transportId), + numIncompatibleConnections(0) {} void initMetrics() { From 44c0eaf4d74e46cf6e42945a7499cafd6ce64c13 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Wed, 11 Apr 2018 11:24:24 -0700 Subject: [PATCH 4/8] fix: transactions created in fdbcli did not wait on the result of committing --- fdbcli/fdbcli.actor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdbcli/fdbcli.actor.cpp b/fdbcli/fdbcli.actor.cpp index 0bc9cbe747..562c52283b 100644 --- a/fdbcli/fdbcli.actor.cpp +++ b/fdbcli/fdbcli.actor.cpp @@ -2513,7 +2513,7 @@ ACTOR Future cli(CLIOptions opt, LineNoise* plinenoise) { printf("ERROR: No active transaction\n"); is_error = true; } else { - commitTransaction( tr ); + Void _ = wait( commitTransaction( tr ) ); intrans = false; options = &globalOptions; } From 0bf1c1ad37b96ae3b5800169e9da8d61d5f768ee Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Wed, 11 Apr 2018 11:32:59 -0700 Subject: [PATCH 5/8] updated the release notes --- documentation/sphinx/source/release-notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/sphinx/source/release-notes.rst b/documentation/sphinx/source/release-notes.rst index 65c2e901f6..0c36300959 100644 --- a/documentation/sphinx/source/release-notes.rst +++ b/documentation/sphinx/source/release-notes.rst @@ -10,6 +10,8 @@ Fixes * The consistency check calculated the size of the database inefficiently. * Could not create new directories with the Python and Ruby implementations of the directory layer. +* fdbcli could erroneously report that it was incompatible with some processes in the cluster. +* The commit commmand in fdbcli did not wait for the result of the commit before continuing to the next command. Other Changes From 5ac9375577f15a768763f3a972da9597dd26f119 Mon Sep 17 00:00:00 2001 From: Yichi Chiang Date: Wed, 11 Apr 2018 12:32:34 -0700 Subject: [PATCH 6/8] Create release 5.1.5 --- documentation/sphinx/source/downloads.rst | 24 +++++++++++------------ packaging/msi/FDBInstaller.wxs | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/documentation/sphinx/source/downloads.rst b/documentation/sphinx/source/downloads.rst index edc604ecd4..1b3ce6f0a2 100644 --- a/documentation/sphinx/source/downloads.rst +++ b/documentation/sphinx/source/downloads.rst @@ -10,38 +10,38 @@ macOS The macOS installation package is supported on macOS 10.7+. It includes the client and (optionally) the server. -* `FoundationDB-5.1.4.pkg `_ +* `FoundationDB-5.1.5.pkg `_ Ubuntu ------ The Ubuntu packages are supported on 64-bit Ubuntu 12.04+, but beware of the Linux kernel bug in Ubuntu 12.x. -* `foundationdb-clients-5.1.4-1_amd64.deb `_ -* `foundationdb-server-5.1.4-1_amd64.deb `_ (depends on the clients package) +* `foundationdb-clients-5.1.5-1_amd64.deb `_ +* `foundationdb-server-5.1.5-1_amd64.deb `_ (depends on the clients package) RHEL/CentOS EL6 --------------- The RHEL/CentOS EL6 packages are supported on 64-bit RHEL/CentOS 6.x. -* `foundationdb-clients-5.1.4-1.el6.x86_64.rpm `_ -* `foundationdb-server-5.1.4-1.el6.x86_64.rpm `_ (depends on the clients package) +* `foundationdb-clients-5.1.5-1.el6.x86_64.rpm `_ +* `foundationdb-server-5.1.5-1.el6.x86_64.rpm `_ (depends on the clients package) RHEL/CentOS EL7 --------------- The RHEL/CentOS EL7 packages are supported on 64-bit RHEL/CentOS 7.x. -* `foundationdb-clients-5.1.4-1.el7.x86_64.rpm `_ -* `foundationdb-server-5.1.4-1.el7.x86_64.rpm `_ (depends on the clients package) +* `foundationdb-clients-5.1.5-1.el7.x86_64.rpm `_ +* `foundationdb-server-5.1.5-1.el7.x86_64.rpm `_ (depends on the clients package) Windows ------- The Windows installer is supported on 64-bit Windows XP and later. It includes the client and (optionally) the server. -* `foundationdb-5.1.4-x64.msi `_ +* `foundationdb-5.1.5-x64.msi `_ API Language Bindings ===================== @@ -58,18 +58,18 @@ On macOS and Windows, the FoundationDB Python API bindings are installed as part If you need to use the FoundationDB Python API from other Python installations or paths, download the Python package: -* `foundationdb-5.1.4.tar.gz `_ +* `foundationdb-5.1.5.tar.gz `_ Ruby 1.9.3/2.0.0+ ----------------- -* `fdb-5.1.4.gem `_ +* `fdb-5.1.5.gem `_ Java 8+ ------- -* `fdb-java-5.1.4.jar `_ -* `fdb-java-5.1.4-javadoc.jar `_ +* `fdb-java-5.1.5.jar `_ +* `fdb-java-5.1.5-javadoc.jar `_ Go 1.1+ ------- diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs index 68bfbd2eb9..fbe7ae9402 100644 --- a/packaging/msi/FDBInstaller.wxs +++ b/packaging/msi/FDBInstaller.wxs @@ -32,7 +32,7 @@ Date: Wed, 11 Apr 2018 12:46:44 -0700 Subject: [PATCH 7/8] Change the installer text to point toward the root of our website rather than the documentation subdirectory. --- packaging/osx/resources/conclusion.rtf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/osx/resources/conclusion.rtf b/packaging/osx/resources/conclusion.rtf index eb94e8e8ba..18d4defd42 100644 --- a/packaging/osx/resources/conclusion.rtf +++ b/packaging/osx/resources/conclusion.rtf @@ -3,4 +3,4 @@ {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural -\f0\fs26 \cf0 Thank you for installing FoundationDB. For documentation, please visit {\field{\*\fldinst HYPERLINK "https://www.foundationdb.org/documentation"}{\fldrslt https://www.foundationdb.org/documentation}}.} \ No newline at end of file +\f0\fs26 \cf0 Thank you for installing FoundationDB. For documentation, please visit {\field{\*\fldinst HYPERLINK "https://www.foundationdb.org"}{\fldrslt https://www.foundationdb.org}}.} \ No newline at end of file From e84c683143a27d18e0d8003cc3715b9ae880c5e0 Mon Sep 17 00:00:00 2001 From: Yichi Chiang Date: Wed, 11 Apr 2018 17:39:58 -0700 Subject: [PATCH 8/8] Release 5.1.5 update versions.target and product id GUID --- packaging/msi/FDBInstaller.wxs | 2 +- versions.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/msi/FDBInstaller.wxs b/packaging/msi/FDBInstaller.wxs index fbe7ae9402..96e530cc65 100644 --- a/packaging/msi/FDBInstaller.wxs +++ b/packaging/msi/FDBInstaller.wxs @@ -32,7 +32,7 @@ - 5.1.5 + 5.1.6 5.1