Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide PSR information for containers. #2291

Merged
merged 1 commit into from May 27, 2020
Merged

Conversation

mJace
Copy link
Contributor

@mJace mJace commented Aug 16, 2019

Allow cadvisor to provide PSR information when doing ps to containers now.
PSR is a ps output option, it shows which cpu that current process runs on.

The related issue:
#2290

@googlebot
Copy link
Collaborator

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it!) and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@k8s-ci-robot
Copy link
Collaborator

Hi @mJace. Thanks for your PR.

I'm waiting for a google or kubernetes 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.

@mJace mJace changed the title Provide PSR information for containers. #2290 Provide PSR information for containers. Aug 16, 2019
@mJace
Copy link
Contributor Author

mJace commented Aug 16, 2019

@googlebot I signed it!

@googlebot
Copy link
Collaborator

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@dashpole
Copy link
Collaborator

/ok-to-test

@dashpole
Copy link
Collaborator

/retest

@mJace
Copy link
Contributor Author

mJace commented Aug 17, 2019

@dashpole How do I run the test in my fork?
I tried to make test at /cadvisor when I just fork master and without changing any code but it has some failure.

@dashpole
Copy link
Collaborator

++ git diff --name-only pages
W0816 19:01:14.397] + [[ ! -z pages/static/assets.go ]]
W0816 19:01:14.398] + echo 'Found changes to UI assets:'
W0816 19:01:14.398] + git diff --name-only pages
W0816 19:01:14.405] ++ make assets FORCE=true
I0816 19:01:14.507] Found changes to UI assets:
I0816 19:01:14.508] pages/static/assets.go
I0816 19:01:15.332] Run: >> building assets
W0816 19:01:15.434] + echo 'Run: >> building assets'
W0816 19:01:15.434] + exit 1

Try just running make locally to reproduce the failure.

@mJace
Copy link
Contributor Author

mJace commented Aug 20, 2019

@dashpole Sorry, I have some problem reproducing the make failure.

I have this error when running make in my master and numa_support branch
log.txt
My master is same as latest google/cadvisor
d200c9f

But if I manually copy 3 modified files to my local google/master and run make.
It can run successfully.
logSuccess.txt

@dashpole dashpole self-assigned this Aug 21, 2019
@dashpole
Copy link
Collaborator

ah, apologies. I forgot about some changes we made to scripts a while back.
You will need to run make assets FORCE=true.

It looks like there is a bug with the script that actually runs make assets FORCE=true, rather than printing it: https://github.com/google/cadvisor/blob/master/build/prow_e2e.sh#L34

I opened #2296 to fix the print statement.

@mJace
Copy link
Contributor Author

mJace commented Aug 23, 2019

@dashpole
Thanks for your fix.
Should I wait for the #2296 to merged to master and re-create this PR again?

Cuz, I still have trouble to run make at my own fork, even if I change the prow_e2e.sh as #2296 did.
But just like I said if I run make at google/cadvisor with the 3 modified file, it can pass the make

But it seems like they are 2 different problems?
#2296 is for pull-cadvisor-e2e CI fail.
the make fail at my on fork is another story.

@dashpole
Copy link
Collaborator

Yeah, you are correct. To fix the failure here, run make assets FORCE=true to rebuild UI assets, and commit the changes.

My PR just fixes the error message from #2291 (comment) so it tells you how to fix that problem.

@mJace
Copy link
Contributor Author

mJace commented Aug 25, 2019

Yeah, you are correct. To fix the failure here, run make assets FORCE=true to rebuild UI assets, and commit the changes.

My PR just fixes the error message from #2291 (comment) so it tells you how to fix that problem.

I see, thank you.

Copy link
Collaborator

@dashpole dashpole left a comment

Choose a reason for hiding this comment

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

lgtm

@dashpole
Copy link
Collaborator

sorry, if you can rebase this, i'm happy to merge it.

@mJace
Copy link
Contributor Author

mJace commented May 22, 2020

@dashpole Thank you!
But I have a build error on the latest master branch 425e211

make build
>> building assets
>> building binaries
>> building cadvisor
internal/storage/influxdb/influxdb.go:29:2: cannot find package "github.com/influxdb/influxdb/client" in any of:
	/usr/local/go/src/github.com/influxdb/influxdb/client (from $GOROOT)
	/home/jace/go/src/github.com/influxdb/influxdb/client (from $GOPATH)
make: *** [Makefile:70: build] Error 1

Can you check this for me? I tried go v1.11 v1.12 v1.13

Or can I ignore the build error on latest master branch, just rebase my branch on google:master ?
Since I can still generate the assets though

@dashpole
Copy link
Collaborator

I would just rebase on master. If it has problems, you can check the logs from the presubmits if you can't get it working in your dev env. I think we use go 1.14 now btw

@mJace
Copy link
Contributor Author

mJace commented May 27, 2020

@dashpole I rebased my branch. Could you take a look? thank you!

@dashpole dashpole merged commit f71439b into google:master May 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants