Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug in include command #1121

Merged
merged 5 commits into from
Feb 8, 2019
Merged

Fix bug in include command #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b11d2ce
Fix bug that in `include` command
sfc-gh-mpilman Jan 31, 2019
c4fa69c
Remove duplicate comment
mpilman Feb 6, 2019
1ecb279
Added release notes for `include` bug
sfc-gh-mpilman Feb 6, 2019
4c58e32
Wording
ajbeamon Feb 8, 2019
9d7aeba
Fix embarrassing typo
ajbeamon Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions documentation/sphinx/source/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Release Notes
#############

6.0.19
======

Fixes
-----

* The ``include`` command in fdbcli would falsly include all machines with IP addresses that
have the included IP address as a prefix (for example ``include 1.0.0.1`` would also include
``1.0.0.10``) `(PR #1121) <https://github.com/apple/foundationdb/pull/1121>`_

6.0.18
======

Expand Down
13 changes: 11 additions & 2 deletions fdbclient/ManagementAPI.actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,8 +1155,17 @@ ACTOR Future<Void> includeServers( Database cx, vector<AddressExclusion> servers
tr.clear( excludedServersKeys );
includeAll = true;
} else if (s.isWholeMachine()) {
// Eliminate both any ip-level exclusion (1.2.3.4) and any port-level exclusions (1.2.3.4:5)
tr.clear( KeyRangeRef( encodeExcludedServersKey(s), encodeExcludedServersKey(s) + char(':'+1) ) );
// Eliminate both any ip-level exclusion (1.2.3.4) and any
// port-level exclusions (1.2.3.4:5)
// The range ['IP', 'IP;'] was originally deleted. ';' is
// char(':' + 1). This does not work, as other for all
// x between 0 and 9, 'IPx' will also be in this range.
//
// This is why we now make two clears: first only of the ip
// address, the second will delete all ports.
auto addr = encodeExcludedServersKey(s);
tr.clear(singleKeyRange(addr));
tr.clear(KeyRangeRef(addr + ':', addr + char(':' + 1)));
} else {
tr.clear( encodeExcludedServersKey(s) );
}
Expand Down