Skip to content

[release/1.2] Improve ARM platform matching#3404

Merged
fuweid merged 1 commit intocontainerd:release/1.2from
crosbymichael:cherry-arm
Jul 12, 2019
Merged

[release/1.2] Improve ARM platform matching#3404
fuweid merged 1 commit intocontainerd:release/1.2from
crosbymichael:cherry-arm

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

This commit improves ARM platform matching in two instances:

  • Some old kernels reported the CPU architecture of arm64 cpus as
    Aarch64 [1].
  • In cases where the user is running with armv8 cpu and kernel but amrhf
    user land (so armhf containerd), a possibility given the compatibility
    of armv8 with armv7.

[1] https://elixir.bootlin.com/linux/v3.14.29/source/arch/arm64/kernel/setup.c#L420

Closes #3387

Signed-off-by: Jaime Caamaño Ruiz [email protected]

This commit improves ARM platform matching in two instances:

* Some old kernels reported the CPU architecture of arm64 cpus as
  Aarch64 [1].
* In cases where the user is running with armv8 cpu and kernel but amrhf
  user land (so armhf containerd), a possibility given the compatibility
  of armv8 with armv7.

[1] https://elixir.bootlin.com/linux/v3.14.29/source/arch/arm64/kernel/setup.c#L420

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>
@crosbymichael crosbymichael added this to the 1.2.8 milestone Jul 12, 2019
@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jul 12, 2019

flaky case shows up again...

@estesp
Copy link
Copy Markdown
Member

estesp commented Jul 12, 2019

flaky case shows up again...

Yeah :( I just restarted it

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3404 into release/1.2 will decrease coverage by 0.14%.
The diff coverage is 0%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3404      +/-   ##
===============================================
- Coverage        43.81%   43.66%   -0.15%     
===============================================
  Files              101      101              
  Lines            10780    10816      +36     
===============================================
  Hits              4723     4723              
- Misses            5321     5357      +36     
  Partials           736      736
Flag Coverage Δ
#linux 47.25% <0%> (-0.2%) ⬇️
#windows 40.78% <0%> (-0.16%) ⬇️
Impacted Files Coverage Δ
platforms/compare.go 0% <0%> (ø) ⬆️
platforms/cpuinfo.go 4.61% <0%> (ø) ⬆️

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 682f6e7...452e9c5. Read the comment docs.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit e12b707 into containerd:release/1.2 Jul 12, 2019
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