Bugfix/1257 units requests #1260
Conversation
| Recursive: true, | ||
| } | ||
| resp, err := r.kAPI.Get(r.ctx(), key, opts) | ||
| if err != nil { |
There was a problem hiding this comment.
you don't return err so this checking serves no purpose - unless we do want to return an error from this function.
| @@ -254,7 +266,7 @@ func dirToHeartbeat(dir *etcd.Node) (heartbeat string) { | |||
| // getUnitFromObject takes a *etcd.Node containing a Unit's jobModel, and | |||
| // instantiates and returns a representative *job.Unit, transitively fetching the | |||
| // associated UnitFile as necessary | |||
There was a problem hiding this comment.
Document what unitFunc does. The name unitHashLookupFunc might make more sense.
mwitkow
force-pushed
the
bugfix/1257-units-requests
branch
from
0134d24 to
efbecf8
Compare
|
Addressed comments. Rebased on |
| func (r *EtcdRegistry) getAllUnitsHashMap() (map[string]*unit.UnitFile, error) { | ||
| key := r.prefixed(unitPrefix) | ||
| opts := &etcd.GetOptions{ | ||
| Recursive: true, |
There was a problem hiding this comment.
please add Quorum: true, which was recently added to github.com/coreos/etcd/client.
There was a problem hiding this comment.
Will do. But out of curiosity, what is the canonical etcd Go client?
https://github.com/coreos/go-etcd
or https://github.com/coreos/etcd/client?
There was a problem hiding this comment.
fwiw, etcd/client is now the canonical client, and go-etcd is deprecated
mwitkow
force-pushed
the
bugfix/1257-units-requests
branch
from
efbecf8 to
5bf8532
Compare
|
Done, PTAL :) |
mwitkow
force-pushed
the
bugfix/1257-units-requests
branch
from
5bf8532 to
96f7d67
Compare
|
@mischief Everthing is fixed, and rebase on latest master. |
|
@mischief, can you take a look at this again? Together with the |
| return r.unitFromEtcdNode(hash, resp.Node) | ||
| } | ||
|
|
||
| // getAllUnitsHashMap retrieves from the Registry all Units and returns a map of hash to Unit |
|
@mwitkow-io A few small comments for you; lgtm after that, thanks! |
|
Damn, this PR got drawned in a chunk of emails after vacation. Will update in a sec. |
mwitkow
force-pushed
the
bugfix/1257-units-requests
branch
from
96f7d67 to
091846e
Compare
|
@jonboulle, @mischief PTAL. Again, apologies for the late response. |
|
Landing via #1376 |
No description provided.