Skip to content

Conversation

@tamilmani1989
Copy link
Member

@tamilmani1989 tamilmani1989 commented Jul 30, 2018

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #
This PR fixes the unparseable error returned by Azure CNI (#195 ). Azure CNI should write result to stdout only in successful case

Special notes for your reviewer:

Release note:


// Output the result to stdout.
res.Print()
log.Printf("[cni-net] ADD command completed with result:%+v err:%v.", result, err)
Copy link
Contributor

Choose a reason for hiding this comment

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

We should still write to the log file what happened to the CNI ADD call

Copy link
Member Author

Choose a reason for hiding this comment

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

ok

@PatrickLang
Copy link
Contributor

How soon can we get a release once this is merged? I'd like to run this through the conformance tests to see if it improves the pass rate.

@PatrickLang
Copy link
Contributor

@sharmasushant - does the change look good? Launching tests this afternoon

@PatrickLang
Copy link
Contributor

The fixes look good. Error handling is better. I added example logs to #195 with the fix

@daschott
Copy link

daschott commented Aug 6, 2018

@sharmasushant anything else needed for merge here?

plugin.Error(vererr)
}

if err == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

if err==nil && res!=nil

asking because if GetAsVersion fails, do we still want to print to stdout?

@sharmasushant
Copy link
Contributor

@daschott we will get this merged by tomorrow.

@PatrickLang
Copy link
Contributor

ping - is this still in the works?

@tamilmani1989
Copy link
Member Author

@sharmasushant I addressed the review comment. Please approve it if everything is good.

@sharmasushant sharmasushant merged commit d0d9a4f into Azure:master Aug 8, 2018
@tamilmani1989 tamilmani1989 deleted the unparseableFix branch September 17, 2018 18:36
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.

4 participants