Fix #3838: Component is left in broken state after redeployment of the pod #3859

jgwest · 2020-08-28T00:29:03Z

What type of PR is this?
/kind bug

What does does this PR do / why we need it:

See #3838 (comment)

Which issue(s) this PR fixes:

Fixes #3838

PR acceptance criteria:

Unit test
Integration test
Documentation
I have read the test guidelines

How to test changes / Special notes to the reviewer:

See #3838 for test reproduction steps.

openshift-ci-robot · 2020-08-28T00:29:25Z

Hi @jgwest. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /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.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

codecov · 2020-08-28T00:46:43Z

Codecov Report

Merging #3859 into master will increase coverage by 0.22%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #3859      +/-   ##
==========================================
+ Coverage   44.19%   44.41%   +0.22%     
==========================================
  Files         141      142       +1     
  Lines       13600    13769     +169     
==========================================
+ Hits         6010     6116     +106     
- Misses       7007     7067      +60     
- Partials      583      586       +3

Impacted Files	Coverage Δ
pkg/sync/adapter.go	`75.93% <0.00%> (-2.36%)`	⬇️
pkg/odo/cli/env/env.go	`18.51% <0.00%> (-18.52%)`	⬇️
pkg/preference/preference.go	`59.47% <0.00%> (-2.11%)`	⬇️
...g/devfile/adapters/kubernetes/component/adapter.go	`34.28% <0.00%> (-0.45%)`	⬇️
pkg/testingutil/pods.go	`0.00% <0.00%> (ø)`
pkg/testingutil/devfile.go	`0.00% <0.00%> (ø)`
pkg/odo/cli/storage/create.go	`0.00% <0.00%> (ø)`
pkg/devfile/adapters/common/types.go	`50.00% <0.00%> (ø)`
pkg/devfile/adapters/common/command_simple.go	`81.25% <0.00%> (ø)`
pkg/devfile/adapters/common/command_supervisor.go	`0.00% <0.00%> (ø)`
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1dfc312...c31e79b. Read the comment docs.

johnmcollier · 2020-08-28T00:57:38Z

/ok-to-test

mik-dass · 2020-08-28T04:39:38Z

tests/integration/devfile/cmd_devfile_push_test.go

+
+			// 3) Ensure the build passes, indicating that all files were correctly synced to the new pod
+			output = helper.CmdShouldPass("odo", commands...)
+			Expect(output).To(ContainSubstring("BUILD SUCCESS"))


Should we also check that all the files are present in the pod after the successful push?

@mik-dass Agreed, can't hurt to check

kadel · 2020-08-28T07:58:27Z

/approve

openshift-ci-robot · 2020-08-28T07:58:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kadel

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kadel]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

mik-dass · 2020-08-31T05:14:23Z

tests/integration/devfile/cmd_devfile_push_test.go

+			equal := reflect.DeepEqual(localFiles, remoteFiles)
+			if !equal {
+				fmt.Fprintf(GinkgoWriter, "Files mismatched between local and remote. local: {%v} remote: {%v}", localFiles, remoteFiles)
+				Fail("Mismatching files between local and remote")


We can directly use Expect(ACTUAL).Should(Equal(EXPECTED)). According to https://onsi.github.io/gomega/, it uses reflect.DeepEqual() underneath.

jgwest · 2020-08-31T15:23:17Z

/retest

cdrage

Code looks great! Thank you!

/lgtm

cdrage · 2020-08-31T19:00:57Z

pkg/sync/adapter.go

@@ -108,7 +108,16 @@ func (a Adapter) SyncFiles(syncParameters common.SyncParameters) (isPushRequired
 			}
 		}

-		// run the indexer and find the modified/added/deleted/renamed files
+		// If the pod changed, reset the index, which will cause the indexer to walk the directory


openshift-bot · 2020-08-31T19:39:10Z

/retest