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

Use uint64 for Memory Stats #1068

Merged
merged 1 commit into from
Jan 27, 2016
Merged

Use uint64 for Memory Stats #1068

merged 1 commit into from
Jan 27, 2016

Conversation

krhubert
Copy link
Contributor

Fix #1065

@googlebot
Copy link
Collaborator

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. 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, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@k8s-bot
Copy link
Collaborator

k8s-bot commented Jan 20, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@krhubert
Copy link
Contributor Author

I signed it!

@googlebot
Copy link
Collaborator

CLAs look good, thanks!

@@ -136,7 +136,7 @@ type MachineInfo struct {
CpuFrequency uint64 `json:"cpu_frequency_khz"`

// The amount of memory (in bytes) in this machine
MemoryCapacity int64 `json:"memory_capacity"`
MemoryCapacity uint64 `json:"memory_capacity"`
Copy link
Contributor

Choose a reason for hiding this comment

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

This change makes sense, but it is a breaking API change :( Its not clear if it will break any users though. So let's try rolling this out and then revert if required.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I know it breaks API, but it can't be done in any other way :( and also int64 is too small for current memory size...

@vishh
Copy link
Contributor

vishh commented Jan 20, 2016

ok to test

@k8s-bot
Copy link
Collaborator

k8s-bot commented Jan 20, 2016

Jenkins GCE e2e

Build/test failed for commit 7d05357.

@vishh
Copy link
Contributor

vishh commented Jan 21, 2016

@krhubert: Tests are failing.

@krhubert
Copy link
Contributor Author

I see, but don't know how this test is running. I have run it localy and everthing was fine (log below).

As i can see from details:

I0120 19:43:51.128928   26521 runner.go:123] Running integration tests targeting "e2e-cadvisor-ubuntu-trusty-docker19"...
I0120 19:44:49.865380   26521 runner.go:153] Execution time 1m54.149321223s
F0120 19:44:49.865469   26521 runner.go:246] Error 0: timed out waiting for cAdvisor to come up at host "e2e-cadvisor-rhel-7-docker19"
Build step 'Execute shell' marked build as failure

The integrantion tests are falling, cAdvisor didn't come up, but there is no logs about why ... :/

[root@dev /usr/src/go/src/github.com/google/cadvisor (master)] git log -1 
commit 7d053578d455b71cc4dc68642ebe00dd99e15262
Author: Hubert Krauze <krhubert@gmail.com>
Date:   Wed Jan 20 08:46:42 2016 +0100

    Use uint64 for Memory Stats
[root@dev /usr/src/go/src/github.com/google/cadvisor (master)] make test; echo $?
>> running tests
?       github.com/google/cadvisor  [no test files]
ok      github.com/google/cadvisor/api  1.031s
?       github.com/google/cadvisor/cache    [no test files]
ok      github.com/google/cadvisor/cache/memory 1.021s
ok      github.com/google/cadvisor/client   1.063s
?       github.com/google/cadvisor/client/clientexample [no test files]
ok      github.com/google/cadvisor/client/v2    1.042s
ok      github.com/google/cadvisor/collector    1.033s
ok      github.com/google/cadvisor/container    1.018s
?       github.com/google/cadvisor/container/docker [no test files]
ok      github.com/google/cadvisor/container/libcontainer   1.044s
ok      github.com/google/cadvisor/container/raw    1.024s
ok      github.com/google/cadvisor/events   1.034s
ok      github.com/google/cadvisor/fs   1.042s
?       github.com/google/cadvisor/healthz  [no test files]
?       github.com/google/cadvisor/http [no test files]
?       github.com/google/cadvisor/http/mux [no test files]
ok      github.com/google/cadvisor/info/v1  1.014s
?       github.com/google/cadvisor/info/v1/test [no test files]
ok      github.com/google/cadvisor/info/v2  1.018s
?       github.com/google/cadvisor/integration/common   [no test files]
?       github.com/google/cadvisor/integration/framework    [no test files]
?       github.com/google/cadvisor/integration/runner   [no test files]
ok      github.com/google/cadvisor/integration/tests/api    1.024s
ok      github.com/google/cadvisor/integration/tests/healthz    1.018s
ok      github.com/google/cadvisor/manager  1.157s
ok      github.com/google/cadvisor/metrics  1.116s
?       github.com/google/cadvisor/pages    [no test files]
?       github.com/google/cadvisor/pages/static [no test files]
?       github.com/google/cadvisor/storage  [no test files]
?       github.com/google/cadvisor/storage/bigquery [no test files]
?       github.com/google/cadvisor/storage/bigquery/client  [no test files]
?       github.com/google/cadvisor/storage/bigquery/client/example  [no test files]
?       github.com/google/cadvisor/storage/elasticsearch    [no test files]
?       github.com/google/cadvisor/storage/influxdb [no test files]
?       github.com/google/cadvisor/storage/redis    [no test files]
?       github.com/google/cadvisor/storage/statsd   [no test files]
?       github.com/google/cadvisor/storage/statsd/client    [no test files]
?       github.com/google/cadvisor/storage/stdout   [no test files]
?       github.com/google/cadvisor/storage/test [no test files]
ok      github.com/google/cadvisor/summary  1.046s
ok      github.com/google/cadvisor/utils    1.017s
?       github.com/google/cadvisor/utils/cloudinfo  [no test files]
?       github.com/google/cadvisor/utils/cpuload    [no test files]
?       github.com/google/cadvisor/utils/cpuload/netlink    [no test files]
?       github.com/google/cadvisor/utils/cpuload/netlink/example    [no test files]
ok      github.com/google/cadvisor/utils/machine    1.023s
ok      github.com/google/cadvisor/utils/oomparser  1.095s
?       github.com/google/cadvisor/utils/oomparser/oomexample   [no test files]
?       github.com/google/cadvisor/utils/procfs [no test files]
?       github.com/google/cadvisor/utils/sysfs  [no test files]
?       github.com/google/cadvisor/utils/sysfs/fakesysfs    [no test files]
ok      github.com/google/cadvisor/utils/sysinfo    1.014s
ok      github.com/google/cadvisor/validate 1.041s
?       github.com/google/cadvisor/version  [no test files]

0

@vishh vishh closed this Jan 23, 2016
@vishh vishh reopened this Jan 23, 2016
@krhubert
Copy link
Contributor Author

@vishh Can you help me with that?

@jimmidyson
Copy link
Collaborator

retest this please

@jimmidyson
Copy link
Collaborator

@k8s-bot test this

@k8s-bot
Copy link
Collaborator

k8s-bot commented Jan 27, 2016

Jenkins GCE e2e

Build/test passed for commit 7d05357.

@jimmidyson
Copy link
Collaborator

Merging as discussed above with @vishh.

jimmidyson added a commit that referenced this pull request Jan 27, 2016
Use uint64 for Memory Stats
@jimmidyson jimmidyson merged commit 1f6f660 into google:master Jan 27, 2016
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.

5 participants