[18.09] Refine how metadata dir is handled #1388

dhiltgen · 2018-09-22T22:04:49Z

This is a follow up PR to #1381 to address some of the review comments
we didn't get to.

Signed-off-by: Daniel Hiltgen daniel.hiltgen@docker.com

codecov-io · 2018-09-28T03:21:11Z

Codecov Report

Merging #1388 into 18.09 will decrease coverage by 0.05%.
The diff coverage is 46.96%.

@@            Coverage Diff             @@
##            18.09    #1388      +/-   ##
==========================================
- Coverage   54.15%   54.09%   -0.06%     
==========================================
  Files         290      290              
  Lines       19298    19313      +15     
==========================================
- Hits        10451    10448       -3     
- Misses       8181     8201      +20     
+ Partials      666      664       -2

dhiltgen · 2018-09-28T05:17:48Z

Note: this depends on the packaging change PR(s)

thaJeztah

Did a quick read over the code, left some comments

thaJeztah · 2018-09-28T13:59:03Z

internal/containerizedengine/update.go

-	authConfig *types.AuthConfig, healthfn func(context.Context) error) error {
+	authConfig *types.AuthConfig, healthfn func(context.Context) error, runtimeMetadataDir string) error {
+
+	// If the user didn't specify an image, detemrine the correct enterprise image to use


nit: typo; s/detemrine/determine/

thaJeztah · 2018-09-28T14:06:22Z

cli/command/engine/activate.go

+			return err
+		}
+		if strings.Contains(strings.ToLower(serverVersion.Platform.Name), "enterprise") {
+			return nil


We should either treat this as an error-situation, or inform the user that no changes were made. In the "happy path", a message will be printed "Successfully activated engine". If we're already on EE, I'd expect some form of feedback as well.

sound good to make this change

@dhiltgen follow-up PR ^^^

thaJeztah · 2018-09-28T14:35:11Z

internal/containerizedengine/update.go

 // ActivateEngine will switch the image from the CE to EE image
 func (c *baseClient) ActivateEngine(ctx context.Context, opts clitypes.EngineInitOptions, out clitypes.OutStream,
-	authConfig *types.AuthConfig, healthfn func(context.Context) error) error {
+	authConfig *types.AuthConfig, healthfn func(context.Context) error, runtimeMetadataDir string) error {


Instead of adding another argument, can we add runtimeMetadataDir as a field on clitypes.EngineInitOptions ?

thaJeztah · 2018-09-28T14:36:39Z

cli/command/engine/client_test.go

 	out clitypes.OutStream,
 	authConfig *types.AuthConfig,
-	healthfn func(context.Context) error) error {
+	healthfn func(context.Context) error, runtimeMetadataDir string) error {


Same here; Instead of adding another argument, can we add runtimeMetadataDir as a field on clitypes.EngineInitOptions ?

Wait: what's that healthfn argument actually for? Looks like it's only used for testing? That really shouldn't be in there; I'm sure that can be set on the mock during testing?

Hmm.. hold over from prior implementations... we really need to get this in ASAP so let me excise that part in a follow up if you don't mind.

thaJeztah · 2018-09-28T14:45:17Z

cli/command/engine/activate.go

 			_, err := client.Ping(ctx)
 			return err
-		}); err != nil {
+		}, clitypes.RuntimeMetadataDir); err != nil {


Related to my other comments about adding this option to the clitypes.EngineInitOptions; it looks like currently we only pass the default value.

We could get that default in client.ActivateEngine() / client.DoUpdate(), i.e., something like

func (c *baseClient) DoUpdate(ctx context.Context, opts clitypes.EngineInitOptions, out clitypes.OutStream, authConfig *types.AuthConfig, healthfn func(context.Context) error) error { if opts.MetaDataDir == "" { opts.MetaDataDir = clitypes.RuntimeMetadataDir } ... }

Doing so, makes the default (empty string) a useful value

thaJeztah · 2018-09-28T14:59:08Z

ping @silvin-lubecki @vdemeester PTAL

dhiltgen · 2018-09-28T15:50:03Z

@thaJeztah if you're still online, could you take a quick peek? We'd like to get this in today if we can so we can cut a beta1.8 build to wrap up a number of remaining P0's.

thaJeztah

changes SGTM, but could use some more eyes on this one

please squash the commits

crosbymichael · 2018-09-28T17:11:38Z

LGTM

This is a follow up PR to docker#1381 to address some of the review comments we didn't get to. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>

andrewhsu

LGTM

GordonTheTurtle added the status/0-triage label Sep 22, 2018

dhiltgen force-pushed the revamp_18.09 branch from de356f9 to fcb28d7 Compare September 28, 2018 03:21

dhiltgen changed the title ~~[WIP] Refine how docker root dir is handled~~ Refine how metadata dir is handled Sep 28, 2018

dhiltgen force-pushed the revamp_18.09 branch from fcb28d7 to 278ac38 Compare September 28, 2018 04:20

dhiltgen mentioned this pull request Sep 28, 2018

Change metadata to be stored in docker-engine docker/docker-ce-packaging#244

Merged

thaJeztah changed the title ~~Refine how metadata dir is handled~~ [18.09] Refine how metadata dir is handled Sep 28, 2018

thaJeztah added status/2-code-review and removed status/0-triage labels Sep 28, 2018

thaJeztah added this to the 18.09.0 milestone Sep 28, 2018

thaJeztah requested changes Sep 28, 2018

View reviewed changes

thaJeztah reviewed Sep 28, 2018

View reviewed changes

dhiltgen force-pushed the revamp_18.09 branch from 79316f2 to 76f64e9 Compare September 28, 2018 16:55

Refine how metadata dir is handled

c12e23a

This is a follow up PR to docker#1381 to address some of the review comments we didn't get to. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>

dhiltgen force-pushed the revamp_18.09 branch from 76f64e9 to c12e23a Compare September 28, 2018 21:14

andrewhsu approved these changes Sep 28, 2018

View reviewed changes

andrewhsu merged commit 5d3ab5b into docker:18.09 Sep 28, 2018

This was referenced Sep 28, 2018

[master] Expose licensing details before loading #1400

Merged

Refine how metadata dir is handled #1405

Merged

[18.09] Remove unused health check func #1406

Merged

[18.09] Refine how metadata dir is handled #1388

[18.09] Refine how metadata dir is handled #1388

Uh oh!

Conversation

dhiltgen commented Sep 22, 2018 • edited by andrewhsu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-io commented Sep 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dhiltgen commented Sep 28, 2018

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Sep 28, 2018

Uh oh!

dhiltgen commented Sep 28, 2018

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

crosbymichael commented Sep 28, 2018

Uh oh!

andrewhsu left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dhiltgen commented Sep 22, 2018 •

edited by andrewhsu

Loading

codecov-io commented Sep 28, 2018 •

edited

Loading