This repository has been archived by the owner on Oct 23, 2024. It is now read-only.
Add Timeout when fetching state.json #341
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
sargun
force-pushed
the
mesos-dns-243
branch
from
f5974de to
597db4b
Compare
| @@ -1,6 +1,7 @@ | |||
| { | |||
| "zk": "zk://127.0.0.1:2181/mesos", | |||
| "masters": ["127.0.0.1:5050"], | |||
| "StateTimeout": 300, | |||
There was a problem hiding this comment.
probably better named stateTimeoutSeconds (lowercase, and express the unit)
There was a problem hiding this comment.
Okay. I'm going to set the field as StateTimeoutSeconds in JSON, rather than using a JSON Tag.
|
initial review complete |
sargun
force-pushed
the
mesos-dns-243
branch
from
597db4b to
19cf777
Compare
| @@ -67,26 +69,27 @@ type Config struct { | |||
| // NewConfig return the default config of the resolver | |||
| func NewConfig() Config { | |||
| return Config{ | |||
There was a problem hiding this comment.
Gofmt shifted everything over due to a longer field
sargun
force-pushed
the
mesos-dns-243
branch
from
19cf777 to
9f8ac93
Compare
| if rip := leaderIP(sj.Leader); rip != ip { | ||
| logging.VeryVerbose.Println("Warning: master changed to " + ip) | ||
| sj = rg.loadFromMaster(rip, port) | ||
| sj, err = rg.loadFromMaster(rip, port) | ||
| if err != nil { |
There was a problem hiding this comment.
why do you need this if? can't you just return sj, err?
sargun
force-pushed
the
mesos-dns-243
branch
4 times, most recently
from
0f603b5 to
65574e9
Compare
| @@ -164,6 +169,7 @@ func testRecordGenerator(t *testing.T, spec labels.Func, ipSources []string) Rec | |||
| if err != nil { | |||
| t.Fatal(err) | |||
| } else if err = json.Unmarshal(b, &sj); err != nil { | |||
| t.Log("err: ", err) | |||
There was a problem hiding this comment.
this is strange: we're already logging the error w/ t.Fatal(), why the additional t.Log()?
There was a problem hiding this comment.
I have no idea how this snuck in. Getting rid of it.
|
nits: otherwise lgtm |
sargun
force-pushed
the
mesos-dns-243
branch
from
65574e9 to
8d2e008
Compare
- Adds an integration test to ensure the timeouts work correctly - Introduces a new configuration flag: StateTimeoutSeconds - Adds stateTimeoutSeconds variable to config.json.sample
sargun
force-pushed
the
mesos-dns-243
branch
from
8d2e008 to
bc1672f
Compare
|
|
sargun
added a commit
that referenced
this pull request
Nov 13, 2015
Add Timeout when fetching state.json
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.
Fixes #243