Skip to content

Commit 9ad8d02

Browse files
etschannenetschannen
authored
Merge pull request #173 from etschannen/release-5.1
Release 5.1.7
2 parents 0d5650d + ee77f4f commit 9ad8d02

File tree

5 files changed

+48
-29
lines changed

5 files changed

+48
-29
lines changed

‎documentation/sphinx/source/downloads.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@ macOS
1010

1111
The macOS installation package is supported on macOS 10.7+. It includes the client and (optionally) the server.
1212

13-
* `FoundationDB-5.1.6.pkg <https://www.foundationdb.org/downloads/5.1.6/macOS/installers/FoundationDB-5.1.6.pkg>`_
13+
* `FoundationDB-5.1.7.pkg <https://www.foundationdb.org/downloads/5.1.7/macOS/installers/FoundationDB-5.1.7.pkg>`_
1414

1515
Ubuntu
1616
------
1717

1818
The Ubuntu packages are supported on 64-bit Ubuntu 12.04+, but beware of the Linux kernel bug in Ubuntu 12.x.
1919

20-
* `foundationdb-clients-5.1.6-1_amd64.deb <https://www.foundationdb.org/downloads/5.1.6/ubuntu/installers/foundationdb-clients_5.1.6-1_amd64.deb>`_
21-
* `foundationdb-server-5.1.6-1_amd64.deb <https://www.foundationdb.org/downloads/5.1.6/ubuntu/installers/foundationdb-server_5.1.6-1_amd64.deb>`_ (depends on the clients package)
20+
* `foundationdb-clients-5.1.7-1_amd64.deb <https://www.foundationdb.org/downloads/5.1.7/ubuntu/installers/foundationdb-clients_5.1.7-1_amd64.deb>`_
21+
* `foundationdb-server-5.1.7-1_amd64.deb <https://www.foundationdb.org/downloads/5.1.7/ubuntu/installers/foundationdb-server_5.1.7-1_amd64.deb>`_ (depends on the clients package)
2222

2323
RHEL/CentOS EL6
2424
---------------
2525

2626
The RHEL/CentOS EL6 packages are supported on 64-bit RHEL/CentOS 6.x.
2727

28-
* `foundationdb-clients-5.1.6-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.6/rhel6/installers/foundationdb-clients-5.1.6-1.el6.x86_64.rpm>`_
29-
* `foundationdb-server-5.1.6-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.6/rhel6/installers/foundationdb-server-5.1.6-1.el6.x86_64.rpm>`_ (depends on the clients package)
28+
* `foundationdb-clients-5.1.7-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.7/rhel6/installers/foundationdb-clients-5.1.7-1.el6.x86_64.rpm>`_
29+
* `foundationdb-server-5.1.7-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.7/rhel6/installers/foundationdb-server-5.1.7-1.el6.x86_64.rpm>`_ (depends on the clients package)
3030

3131
RHEL/CentOS EL7
3232
---------------
3333

3434
The RHEL/CentOS EL7 packages are supported on 64-bit RHEL/CentOS 7.x.
3535

36-
* `foundationdb-clients-5.1.6-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.6/rhel7/installers/foundationdb-clients-5.1.6-1.el7.x86_64.rpm>`_
37-
* `foundationdb-server-5.1.6-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.6/rhel7/installers/foundationdb-server-5.1.6-1.el7.x86_64.rpm>`_ (depends on the clients package)
36+
* `foundationdb-clients-5.1.7-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.7/rhel7/installers/foundationdb-clients-5.1.7-1.el7.x86_64.rpm>`_
37+
* `foundationdb-server-5.1.7-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/5.1.7/rhel7/installers/foundationdb-server-5.1.7-1.el7.x86_64.rpm>`_ (depends on the clients package)
3838

3939
Windows
4040
-------
4141

4242
The Windows installer is supported on 64-bit Windows XP and later. It includes the client and (optionally) the server.
4343

44-
* `foundationdb-5.1.6-x64.msi <https://www.foundationdb.org/downloads/5.1.6/windows/installers/foundationdb-5.1.6-x64.msi>`_
44+
* `foundationdb-5.1.7-x64.msi <https://www.foundationdb.org/downloads/5.1.7/windows/installers/foundationdb-5.1.7-x64.msi>`_
4545

4646
API Language Bindings
4747
=====================
@@ -58,18 +58,18 @@ On macOS and Windows, the FoundationDB Python API bindings are installed as part
5858

5959
If you need to use the FoundationDB Python API from other Python installations or paths, download the Python package:
6060

61-
* `foundationdb-5.1.6.tar.gz <https://www.foundationdb.org/downloads/5.1.6/bindings/python/foundationdb-5.1.6.tar.gz>`_
61+
* `foundationdb-5.1.7.tar.gz <https://www.foundationdb.org/downloads/5.1.7/bindings/python/foundationdb-5.1.7.tar.gz>`_
6262

6363
Ruby 1.9.3/2.0.0+
6464
-----------------
6565

66-
* `fdb-5.1.6.gem <https://www.foundationdb.org/downloads/5.1.6/bindings/ruby/fdb-5.1.6.gem>`_
66+
* `fdb-5.1.7.gem <https://www.foundationdb.org/downloads/5.1.7/bindings/ruby/fdb-5.1.7.gem>`_
6767

6868
Java 8+
6969
-------
7070

71-
* `fdb-java-5.1.6.jar <https://www.foundationdb.org/downloads/5.1.6/bindings/java/fdb-java-5.1.6.jar>`_
72-
* `fdb-java-5.1.6-javadoc.jar <https://www.foundationdb.org/downloads/5.1.6/bindings/java/fdb-java-5.1.6-javadoc.jar>`_
71+
* `fdb-java-5.1.7.jar <https://www.foundationdb.org/downloads/5.1.7/bindings/java/fdb-java-5.1.7.jar>`_
72+
* `fdb-java-5.1.7-javadoc.jar <https://www.foundationdb.org/downloads/5.1.7/bindings/java/fdb-java-5.1.7-javadoc.jar>`_
7373

7474
Go 1.1+
7575
-------

‎documentation/sphinx/source/release-notes.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Release Notes
33
#############
44

5+
5.1.7
6+
=====
7+
8+
Fixes
9+
-----
10+
11+
* fdbdr switch could take a long time to complete if the two clusters were not created at the same time. <rdar://problem/37551521>
12+
513
5.1.6
614
=====
715

‎fdbclient/DatabaseBackupAgent.actor.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,19 +1426,6 @@ class DatabaseBackupAgentImpl {
14261426

14271427
TraceEvent("DBA_switchover_stopped");
14281428

1429-
try {
1430-
Void _ = wait( drAgent.submitBackup(backupAgent->taskBucket->src, tagName, backupRanges, false, addPrefix, removePrefix, true, true) );
1431-
} catch( Error &e ) {
1432-
if( e.code() != error_code_backup_duplicate )
1433-
throw;
1434-
}
1435-
1436-
TraceEvent("DBA_switchover_submitted");
1437-
1438-
int _ = wait( drAgent.waitSubmitted(backupAgent->taskBucket->src, tagName) );
1439-
1440-
TraceEvent("DBA_switchover_started");
1441-
14421429
state ReadYourWritesTransaction tr3(dest);
14431430
loop {
14441431
try {
@@ -1460,6 +1447,19 @@ class DatabaseBackupAgentImpl {
14601447

14611448
TraceEvent("DBA_switchover_version_upgraded");
14621449

1450+
try {
1451+
Void _ = wait( drAgent.submitBackup(backupAgent->taskBucket->src, tagName, backupRanges, false, addPrefix, removePrefix, true, true) );
1452+
} catch( Error &e ) {
1453+
if( e.code() != error_code_backup_duplicate )
1454+
throw;
1455+
}
1456+
1457+
TraceEvent("DBA_switchover_submitted");
1458+
1459+
int _ = wait( drAgent.waitSubmitted(backupAgent->taskBucket->src, tagName) );
1460+
1461+
TraceEvent("DBA_switchover_started");
1462+
14631463
Void _ = wait( backupAgent->unlockBackup(dest, tagName) );
14641464

14651465
TraceEvent("DBA_switchover_unlocked");

‎fdbserver/SimulatedCluster.actor.cpp

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,19 @@ void setupSimulatedSystem( vector<Future<Void>> *systemActors, std::string baseF
832832

833833
ASSERT( coordinatorAddresses.size() == coordinatorCount );
834834
ClusterConnectionString conn(coordinatorAddresses, LiteralStringRef("TestCluster:0"));
835-
g_simulator.extraDB = new ClusterConnectionString(coordinatorAddresses, ((extraDB==0 || (extraDB==1 && BUGGIFY)) ? LiteralStringRef("TestCluster:0") : LiteralStringRef("ExtraCluster:0")));
836-
835+
836+
// If extraDB==0, leave g_simulator.extraDB as null because the test does not use DR.
837+
if(extraDB==1) {
838+
// The DR database can be either a new database or itself
839+
g_simulator.extraDB = new ClusterConnectionString(coordinatorAddresses, BUGGIFY ? LiteralStringRef("TestCluster:0") : LiteralStringRef("ExtraCluster:0"));
840+
} else if(extraDB==2) {
841+
// The DR database is a new database
842+
g_simulator.extraDB = new ClusterConnectionString(coordinatorAddresses, LiteralStringRef("ExtraCluster:0"));
843+
} else if(extraDB==3) {
844+
// The DR database is the same database
845+
g_simulator.extraDB = new ClusterConnectionString(coordinatorAddresses, LiteralStringRef("TestCluster:0"));
846+
}
847+
837848
*pConnString = conn;
838849

839850
TraceEvent("SimulatedConnectionString").detail("String", conn.toString()).detail("ConfigString", startingConfigString);
@@ -874,7 +885,7 @@ void setupSimulatedSystem( vector<Future<Void>> *systemActors, std::string baseF
874885
systemActors->push_back(reportErrors(simulatedMachine(conn, ips, sslEnabled,
875886
localities, processClass, baseFolder, false, machine == useSeedForMachine, true ), "SimulatedMachine"));
876887

877-
if (extraDB) {
888+
if (extraDB && g_simulator.extraDB->toString() != conn.toString()) {
878889
std::vector<uint32_t> extraIps;
879890
for (int i = 0; i < processesPerMachine; i++){
880891
extraIps.push_back(4 << 24 | dc << 16 | g_random->randomInt(1, i + 2) << 8 | machine);

‎packaging/msi/FDBInstaller.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
3434
<Product Name='$(var.Title)'
35-
Id='{E0036E6A-8287-4BAD-A709-FBE032AF5415}'
35+
Id='{DE55C28C-2185-481F-BA9B-5E9E28861C32}'
3636
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
3737
Version='$(var.Version)'
3838
Manufacturer='$(var.Manufacturer)'

0 commit comments

Comments
 (0)