Skip to content

Fix integration test data race and slowness#1920

Merged
aaronlehmann merged 1 commit into
moby:masterfrom
cyli:fix-integration-test
Feb 3, 2017
Merged

Fix integration test data race and slowness#1920
aaronlehmann merged 1 commit into
moby:masterfrom
cyli:fix-integration-test

Conversation

@cyli
Copy link
Copy Markdown
Contributor

@cyli cyli commented Feb 3, 2017

#1919 inadvertently left a logrus.Debug setting in the integration test, which was causing a data race.

Also, add the following optimizations for the integration test added in #1919:

  • make the renew TLS certificate loop's exponential backoff configurable, so it can be set for testing
  • if a node exits before it's ready, bail integration.cluster.StartNode early so we don't have to
    wait for the timeout

Signed-off-by: cyli ying.li@docker.com

@cyli cyli force-pushed the fix-integration-test branch from cbb4049 to 95442d5 Compare February 3, 2017 00:41
@cyli cyli changed the title WIP: Fix integration test data race and slowness Fix integration test data race and slowness Feb 3, 2017
Comment thread ca/config.go Outdated
log.WithFields(logrus.Fields{
"time": time.Now().Add(retry),
}).Debugf("next certificate renewal scheduled")
}).Debugf("next certificate renewal scheduled for %v", retry)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This should probably log the time when the renewal is scheduled, or phrase it as "for %v from now"

…e integration test.

Also, add the following optimizations for the integration tests:
- make the renew TLS certificate loop's exponential backoff configurable, so it can be set for testing
- if a node exits before it's ready, bail `integration.cluster.StartNode` early so we don't have to
  wait for the timeout

Signed-off-by: cyli <ying.li@docker.com>
@cyli cyli force-pushed the fix-integration-test branch from 95442d5 to 9dbe262 Compare February 3, 2017 00:53
Copy link
Copy Markdown
Contributor

@LK4D4 LK4D4 left a comment

Choose a reason for hiding this comment

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

LGTM

@aaronlehmann
Copy link
Copy Markdown
Collaborator

LGTM

@aaronlehmann aaronlehmann merged commit 3b7aa0d into moby:master Feb 3, 2017
@cyli cyli deleted the fix-integration-test branch February 3, 2017 19:14
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