Skip to content

cephadm: strip whitespace from iscsi version#35549

Merged
tchaikov merged 1 commit intoceph:masterfrom
mgfritch:cephadm-iscsi-strip-version
Jun 17, 2020
Merged

cephadm: strip whitespace from iscsi version#35549
tchaikov merged 1 commit intoceph:masterfrom
mgfritch:cephadm-iscsi-strip-version

Conversation

@mgfritch
Copy link
Contributor

@mgfritch mgfritch commented Jun 11, 2020

Remove the \n char from the iscsi version.

ceph orch ps
NAME                         HOST      STATUS        REFRESHED  AGE  VERSION              IMAGE NAME                                      IMAGE ID      CONTAINER ID  
crash.host1                  host1     running (2d)  11m ago    2d   16.0.0-899-g18734af  docker.io/ceph/daemon-base:latest-master-devel  7bb50d3c5c9a  5b184588ff45
iscsi.iscsi.host1.mkpetc     host1     running (2h)  11m ago    2h   3.4                  docker.io/ceph/daemon-base:latest-master-devel  7bb50d3c5c9a  e695cd698d8a
                                                                                                                                                                      
nfs.foo.host1                host1     running (2d)  11m ago    2d   3.2                  docker.io/ceph/daemon-base:latest-master-devel  7bb50d3c5c9a  50d2f41073b1


$ ceph orch ps --daemon-type iscsi --format json-pretty
[
  {
    "container_id": "e695cd698d8a",
    "container_image_id": "7bb50d3c5c9afcb8d68417890cae4ac782cf68c9b48e2879bc7e610cc7e2d45c",
    "container_image_name": "docker.io/ceph/daemon-base:latest-master-devel",
    "created": "2020-06-11T19:40:44.235423",
    "daemon_id": "iscsi.host1.mkpetc",
    "daemon_type": "iscsi",
    "hostname": "host1",
    "last_refresh": "2020-06-11T20:23:53.395076",
    "started": "2020-06-11T19:40:44.484183",
    "status": 1,
    "status_desc": "running",
    "version": "3.4\n"
  }
]

Signed-off-by: Michael Fritch mfritch@suse.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@mgfritch
cephadm: strip whitespace from iscsi version
f23649c 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch mgfritch requested a review from matthewoliver June 11, 2020 22:16
@mgfritch mgfritch requested a review from a team as a code owner June 11, 2020 22:16
bk201
bk201 approved these changes Jun 12, 2020
View reviewed changes
Copy link
Contributor

@bk201 bk201 left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this.
Not easy to spot this in Dashboard, the new line symbol incurs a space after version:
Screen Shot 2020-06-12 at 10 55 23 AM

@tchaikov
Copy link
Contributor

tchaikov commented Jun 17, 2020

test failure is tracked by https://tracker.ceph.com/issues/46046

@tchaikov tchaikov merged commit d780443 into ceph:master Jun 17, 2020
@mgfritch mgfritch deleted the cephadm-iscsi-strip-version branch June 18, 2020 16:15
@sebastian-philipp sebastian-philipp mentioned this pull request Jul 2, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthewoliver matthewoliver Awaiting requested review from matthewoliver

1 more reviewer

@bk201 bk201 bk201 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cephadm needs-qa wip-kefu-testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mgfritch @tchaikov @bk201 @sebastian-philipp