Use existing global var criSupportedLogDrivers #44126

xiangpengzhao · 2017-04-06T03:08:18Z

What this PR does / why we need it:
Use existing global var criSupportedLogDrivers defined in docker_service.go. If CRI supports other log drivers in the future, we will only need to modify that global var.

cc @Random-Liu

k8s-ci-robot · 2017-04-06T03:08:25Z

Hi @xiangpengzhao. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

k8s-reviewable · 2017-04-06T03:09:24Z

This change is

timstclair · 2017-04-24T18:48:08Z

pkg/kubelet/dockershim/docker_container.go

-			glog.Errorf("Cannot create symbolic link because container log file doesn't exist!")
-		} else {
-			glog.V(5).Infof("Unsupported logging driver: %s", dockerLoggingDriver)
+		for _, driver := range criSupportedLogDrivers {


This logic is incorrect. You'll end up logging the error for each supported driver. How about just creating an isSupportedLogDriver(driver string) bool helper function?

Actually, there is already such a function, we should use it https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/dockershim/docker_service.go#L483-L494

timstclair · 2017-04-24T18:48:22Z

pkg/kubelet/dockershim/docker_container.go

-			glog.V(5).Infof("Unsupported logging driver: %s", dockerLoggingDriver)
+		for _, driver := range criSupportedLogDrivers {
+			if dockerLoggingDriver == driver {
+				glog.Errorf("Cannot create symbolic link because container log file doesn't exist!")


shouldn't this return an error instead of logging it?

@timstclair Thanks for your reviewing and comments. IMO, when we find realPath empty, we just need to give users some logs for debugging. We don't want to return error for any conditions when realPath is empty. Former discussion in #38691 with @Random-Liu and other folks.

I remember the problem is that some InspectContainer of fake docker client doesn't return the log path.
If we return error here, it will break many unit tests.

And it's fine to not return error here, because:

In real case, real path should never be nil;

The symlink is a best effort thing now. Even if we return an error here, next SyncPod will think the container is running, because the container is started already.

Ok, in that case this should be Info or Warning level, not Error.

timstclair · 2017-04-24T18:49:18Z

pkg/kubelet/dockershim/docker_container.go

@@ -243,10 +239,12 @@ func (ds *dockerService) createContainerLogSymlink(containerID string) error {
 			glog.V(10).Infof("Docker logging driver is %s", dockerLoggingDriver)
 		}



(above, line 236) Shouldn't that glog.Errorf call return an error instead? We don't want to carry on if the dockerInfo call didn't return anything useful...

xiangpengzhao · 2017-04-27T04:22:45Z

Comment addressed. Used IsCRISupportedLogDriver and left logic as is.
@timstclair @Random-Liu PTAL.

Random-Liu

LGTM with one nit.

Random-Liu · 2017-04-27T18:22:05Z

pkg/kubelet/dockershim/docker_container.go

-		} else {
-			dockerLoggingDriver = dockerInfo.LoggingDriver
-			glog.V(10).Infof("Docker logging driver is %s", dockerLoggingDriver)
+			glog.Errorf("Failed to check supported logging driver by CRI: %v", err)


nit: Would better to return here.

xiangpengzhao · 2017-04-28T05:15:48Z

nit addressed. PTAL @Random-Liu

Random-Liu · 2017-04-28T18:36:16Z

/approve

Random-Liu · 2017-04-28T18:36:31Z

@timstclair Are you ok with this PR?

xiangpengzhao · 2017-05-04T02:25:17Z

Thanks @timstclair ! Inline comment addressed. PTAL.

cc @Random-Liu

…RISupportedLogDriver

timstclair · 2017-05-08T21:05:25Z

/lgtm

k8s-github-robot · 2017-05-08T21:05:30Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, timstclair, xiangpengzhao

Needs approval from an approver in each of these OWNERS Files:

~~pkg/kubelet/OWNERS~~ [Random-Liu,timstclair]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

k8s-github-robot · 2017-05-08T23:34:43Z

Automatic merge from submit-queue (batch tested with PRs 45508, 44258, 44126, 45441, 45320)

k8s-github-robot assigned timstclair Apr 6, 2017

k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Apr 6, 2017

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 6, 2017

timstclair suggested changes Apr 24, 2017

View reviewed changes

Random-Liu reviewed Apr 27, 2017

View reviewed changes

xiangpengzhao force-pushed the fix-const branch 2 times, most recently from 4bd037a to 106a9e0 Compare April 28, 2017 05:14

Random-Liu added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Apr 28, 2017

k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2017

xiangpengzhao force-pushed the fix-const branch from f2a2da6 to 9af3b0a Compare May 4, 2017 02:23

Use existed global var criSupportedLogDrivers and helper function IsC…

9af3b0a

…RISupportedLogDriver

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 8, 2017

k8s-github-robot merged commit 60e0271 into kubernetes:master May 8, 2017

xiangpengzhao deleted the fix-const branch July 3, 2017 03:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use existing global var criSupportedLogDrivers #44126

Use existing global var criSupportedLogDrivers #44126

xiangpengzhao commented Apr 6, 2017

k8s-ci-robot commented Apr 6, 2017

k8s-reviewable commented Apr 6, 2017

timstclair Apr 24, 2017

Random-Liu Apr 26, 2017

timstclair Apr 24, 2017

xiangpengzhao Apr 25, 2017

Random-Liu Apr 26, 2017 •

edited

timstclair May 4, 2017

timstclair Apr 24, 2017

xiangpengzhao commented Apr 27, 2017

Random-Liu left a comment

Random-Liu Apr 27, 2017

xiangpengzhao commented Apr 28, 2017

Random-Liu commented Apr 28, 2017

Random-Liu commented Apr 28, 2017

xiangpengzhao commented May 4, 2017

timstclair commented May 8, 2017

k8s-github-robot commented May 8, 2017

k8s-github-robot commented May 8, 2017

		@@ -243,10 +239,12 @@ func (ds *dockerService) createContainerLogSymlink(containerID string) error {
		glog.V(10).Infof("Docker logging driver is %s", dockerLoggingDriver)
		}

Use existing global var criSupportedLogDrivers #44126

Use existing global var criSupportedLogDrivers #44126

Conversation

xiangpengzhao commented Apr 6, 2017

k8s-ci-robot commented Apr 6, 2017

k8s-reviewable commented Apr 6, 2017

timstclair Apr 24, 2017

Choose a reason for hiding this comment

Random-Liu Apr 26, 2017

Choose a reason for hiding this comment

timstclair Apr 24, 2017

Choose a reason for hiding this comment

xiangpengzhao Apr 25, 2017

Choose a reason for hiding this comment

Random-Liu Apr 26, 2017 • edited

Choose a reason for hiding this comment

timstclair May 4, 2017

Choose a reason for hiding this comment

timstclair Apr 24, 2017

Choose a reason for hiding this comment

xiangpengzhao commented Apr 27, 2017

Random-Liu left a comment

Choose a reason for hiding this comment

Random-Liu Apr 27, 2017

Choose a reason for hiding this comment

xiangpengzhao commented Apr 28, 2017

Random-Liu commented Apr 28, 2017

Random-Liu commented Apr 28, 2017

xiangpengzhao commented May 4, 2017

timstclair commented May 8, 2017

k8s-github-robot commented May 8, 2017

k8s-github-robot commented May 8, 2017

Random-Liu Apr 26, 2017 •

edited