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

bugfix: rename lxcfs to pouch-lxcfs in pouch.rpm #1490

Merged
merged 1 commit into from
Jun 8, 2018

Conversation

Letty5411
Copy link
Contributor

@Letty5411 Letty5411 commented Jun 8, 2018

Signed-off-by: letty letty.ll@alibaba-inc.com

Ⅰ. Describe what this PR did

Instead of offering lxcfs binary, pouch rpm offers a pouch-lxcfs binary to avoid conflict with users environment.

Ⅱ. Does this pull request fix one issue?

fix #1476

Ⅲ. Describe how you did it

  1. change the liblxcfs.so to libpouchlxcfs.so in lxcfs source code.
  2. remove files in share directory, which is used for LXC
  3. rename lxcfs.service to pouch-lxcfs.service

Ⅳ. Describe how to verify it

Now rpm includes the following files:

#rpm -qlp pouch-1.0.0-1.el7.centos.x86_64.rpm
warning: pouch-1.0.0-1.el7.centos.x86_64.rpm: Header V4 RSA/SHA1 Signature, key ID 439ae9ec: NOKEY
/usr/bin/pouch-lxcfs
/usr/lib/systemd/system/pouch-lxcfs.service
/usr/lib/systemd/system/pouch.service
/usr/lib64/libpouchlxcfs.so
/usr/local/bin/containerd
/usr/local/bin/containerd-release
/usr/local/bin/containerd-shim
/usr/local/bin/containerd-stress
/usr/local/bin/ctr
/usr/local/bin/pouch
/usr/local/bin/pouchd
/usr/local/bin/runc

start pouch-lxcfs service

#systemctl start pouch-lxcfs

[root@r10e16207.sqa.zmf /tmp]
#ps -aux|grep lxcfs
root      16303  0.2  0.0  95316  1036 ?        Ssl  11:17   0:00 /usr/bin/pouch-lxcfs /var/lib/pouch-lxcfs/
root      23888  0.0  0.0 234720  3084 ?        Ssl  Apr18   0:28 /usr/bin/lxcfs /var/lib/lxcfs/
root      32367  0.0  0.0 112668   960 pts/0    S+   11:17   0:00 grep --color=auto lxcfs

#ls /var/lib/pouch-lxcfs/
cgroup  proc

Start pouchd with lxcfs enabled:

pouchd --enable-lxcfs --lxcfs /usr/local/bin/pouch-lxcfs --lxcfs-home /var/lib/pouch-lxcfs

Verify lxcfs works:

#pouch run -it -m 500m busybox
/ # cd /proc/
1/        bus/      fs/       irq/      net/      self/     sysvipc/
acpi/     driver/   ipmi/     mpt/      scsi/     sys/      tty/
/ # cat /proc/meminfo
MemTotal:         512000 kB

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/S labels Jun 8, 2018
Signed-off-by: letty <letty.ll@alibaba-inc.com>
@codecov-io
Copy link

Codecov Report

Merging #1490 into master will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #1490      +/-   ##
=========================================
+ Coverage   40.45%   40.5%   +0.04%     
=========================================
  Files         253     253              
  Lines       16466   16466              
=========================================
+ Hits         6662    6669       +7     
+ Misses       8948    8941       -7     
  Partials      856     856
Impacted Files Coverage Δ
ctrd/image.go 79.42% <0%> (+2.85%) ⬆️
apis/server/utils.go 64.28% <0%> (+4.76%) ⬆️

@Letty5411 Letty5411 requested a review from CodeJuan June 8, 2018 08:35
@CodeJuan
Copy link
Contributor

CodeJuan commented Jun 8, 2018

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

name conflicts of lxcfs
4 participants