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.

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

Shorten image importer dialTimeout to 5 seconds #6418

Merged
merged 1 commit into from
Dec 20, 2015
Merged

Shorten image importer dialTimeout to 5 seconds #6418

merged 1 commit into from
Dec 20, 2015

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Dec 18, 2015

Related to #6381
Related to #6259

@liggitt
Copy link
Contributor Author

liggitt commented Dec 18, 2015

[test]

@liggitt
Copy link
Contributor Author

liggitt commented Dec 18, 2015

@deads2k @stevekuznetsov PTAL
Once the parallel image import goes in, I would consider lengthening this to 10 seconds
Left as 10 seconds in the unit tests, and the original 30 seconds in the new-app client

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to b8ad889

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/8006/)

@liggitt
Copy link
Contributor Author

liggitt commented Dec 19, 2015

green jenkins... mysql:latest import was much better (~10 seconds)

this was still longer than I'd like, but I expect @deads2k's changes (parallel and abandoning NotFound imports) will significantly improve this:

SUCCESS after 42.423s: hack/../test/cmd/newapp.sh:143: executing 'oc get imagestreamtags installable:file' expecting success; re-trying every 0.2s until completion or 60.000s

@liggitt
Copy link
Contributor Author

liggitt commented Dec 19, 2015

Merging to help the queue. Would still like review and can adjust in a follow up if needed

@liggitt
Copy link
Contributor Author

liggitt commented Dec 19, 2015

[merge]

@liggitt
Copy link
Contributor Author

liggitt commented Dec 19, 2015

Fun... flakes blocking flake fixes - #6065

I1219 14:52:03.014415   21047 etcd.go:37] Deleting &etcd.Node{Key:"/kubernetes.io", Value:"", Dir:true, Expiration:(*time.Time)(nil), TTL:0, Nodes:etcd.Nodes(nil), ModifiedIndex:0x348, CreatedIndex:0x348} (child of &etcd.Node{Key:"", Value:"", Dir:true, Expiration:(*time.Time)(nil), TTL:0, Nodes:etcd.Nodes{(*etcd.Node)(0xc2086b8060), (*etcd.Node)(0xc2086b80c0)}, ModifiedIndex:0x0, CreatedIndex:0x0})
I1219 14:52:07.248341   21047 etcd.go:37] Deleting &etcd.Node{Key:"/openshift.io", Value:"", Dir:true, Expiration:(*time.Time)(nil), TTL:0, Nodes:etcd.Nodes(nil), ModifiedIndex:0x34f, CreatedIndex:0x34f} (child of &etcd.Node{Key:"", Value:"", Dir:true, Expiration:(*time.Time)(nil), TTL:0, Nodes:etcd.Nodes{(*etcd.Node)(0xc2086b8060), (*etcd.Node)(0xc2086b80c0)}, ModifiedIndex:0x0, CreatedIndex:0x0})
F1219 14:52:14.653034   21047 etcd.go:39] Unable to delete key: 100: Key not found (/openshift.io) [1124]

[merge]

@liggitt
Copy link
Contributor Author

liggitt commented Dec 19, 2015

#6031

test-cmd.sh
Logging to /tmp/openshift-cmd/MPVw/logs...
openshift: openshift v1.1-582-g0add922 kubernetes v1.1.0-origin-1107-g4c8e6f4 etcd 2.1.2
[INFO] Create certificates for the OpenShift server to /tmp/openshift-cmd/MPVw/openshift.local.config/master
Generated new key pair as /tmp/openshift-cmd/MPVw/openshift.local.config/master/serviceaccounts.public.key and /tmp/openshift-cmd/MPVw/openshift.local.config/master/serviceaccounts.private.key
Generating node credentials ...
Created node config for 172.18.4.199 in /tmp/openshift-cmd/MPVw/openshift.local.config/node-172.18.4.199
Wrote master config to: /tmp/openshift-cmd/MPVw/openshift.local.config/master/master-config.yaml
Generating node credentials ...
Created node config for 172.18.4.199 in /tmp/openshift-cmd/MPVw/openshift.local.config/node-172.18.4.199
validation: ok
ERROR: gave up waiting for https://127.0.0.1:28443/healthz

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4436/) (Image: devenv-rhel7_3003)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to b8ad889

openshift-bot pushed a commit that referenced this pull request Dec 20, 2015
@openshift-bot openshift-bot merged commit 2427d80 into openshift:master Dec 20, 2015
@@ -63,7 +63,7 @@ func retryWhenUnreachable(t *testing.T, f func() error) error {
}

func TestRegistryClientConnect(t *testing.T) {
c := dockerregistry.NewClient()
c := dockerregistry.NewClient(10 * time.Second)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I get some constants in the update? This looks a little silly. DefaultTimeout or something. Even a separate constructor for the 90% who don't care.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants