Add reservations to admin control subnet allocs #369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eyakubovich
force-pushed
the
reservations
branch
from
ca83d28 to
f93382c
Compare
| @@ -241,6 +241,73 @@ func handleNetworks(ctx context.Context, sm subnet.Manager, w http.ResponseWrite | |||
| jsonResponse(w, http.StatusOK, wr) | |||
| } | |||
|
|
|||
| // POST /{network}/reservations | |||
| func handleAddReservation(ctx context.Context, sm subnet.Manager, w http.ResponseWriter, r *http.Request) { | |||
| defer r.Body.Close() | |||
There was a problem hiding this comment.
The handler does not need to close the request body. The http server will do that for you.
There was a problem hiding this comment.
Nice, never knew that.
|
Feel good about the overall approach. |
| t.Fatalf("failed to remove reservation: %v", err) | ||
| } | ||
|
|
||
| // The node should not have a TTL |
This adds ability to add and remove reservations for subnet allocations. A subnet is reserved with the host IP (PublicIP). flannel will then use this subnet for a host requesting a subnet. Reservations are denoted in etcd as subnets with no expiration (TTL is zero). When a reserved subnet is allocated, it's TTL continues to be not set. If a reservation is removed, the TTL is set to the usual 24 hours. Also adds corresponding client/server APIs for reservation management. Fixes flannel-io#280
eyakubovich
force-pushed
the
reservations
branch
from
f93382c to
92ce594
Compare
|
Do we have an e2e test or integration test yet? The code LGTM. |
|
We don't have e2e tests. That's on a todo list and it's non-trivial task as it requires setting up etcd and multiple containers or VMs for flannel daemons. |
eyakubovich
added a commit
that referenced
this pull request
Nov 17, 2015
Add reservations to admin control subnet allocs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds ability to add and remove reservations
for subnet allocations. A subnet is reserved with
the host IP (PublicIP). flannel will then use this
subnet for a host requesting a subnet.
Reservations are denoted in etcd as subnets with no
expiration (TTL is zero). When a reserved subnet is
allocated, it's TTL continues to be not set. If a
reservation is removed, the TTL is set to the usual
24 hours.
Also adds corresponding client/server APIs for
reservation management.
Fixes #280