Making the allocs hold service ids #583
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
| @@ -246,6 +246,10 @@ func (s *SystemScheduler) computePlacements(place []allocTuple) error { | |||
| Metrics: s.ctx.Metrics(), | |||
| } | |||
|
|
|||
| // Generate the service ids for the tasks that this allocation is going | |||
| // to run | |||
| alloc.PopulateServiceIds() | |||
There was a problem hiding this comment.
Can probably move this inside if option != nil { block
diptanu
force-pushed
the
f-consul-service
branch
from
ae861af
to
d4d7572
Compare
| c.trackedTskLock.Unlock() | ||
| for _, service := range task.Services { | ||
| c.logger.Printf("[INFO] consul: registering service %s with consul.", service.Name) | ||
| if err := c.registerService(service, task, allocID); err != nil { | ||
| if err := c.registerService(service, task, alloc); err != nil { | ||
| fmt.Printf("DIPTANU ERR %v\n", err) |
| for _, task := range tg.Tasks { | ||
| for _, service := range task.Services { | ||
| // We add a prefix to the Service ID so that we can know that this service | ||
| // is managed by Nomad Consul since Consul can also have service which are not |
…hey are removed from the Tasks
| for _, service := range task.Services { | ||
| // If the ID for a service name is already generated then we re-use | ||
| // it | ||
| if ID, ok := oldIDs[service.Name]; ok { |
There was a problem hiding this comment.
lowercase the ID field. camelCase is go style
|
LGTM |
diptanu
added a commit
that referenced
this pull request
Dec 15, 2015
Making the allocs hold service ids
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When we moved to generating the service ids on the server side, it created a problem for jobs whose count > 1 since service ids needs to be unique for an agent as Task definitions are shared across allocations.
This change makes the allocations host service ids for the tasks that they are going to run. Since Allocations are always unique, the service ids will be generated uniquely per allocation.