cephadm: Add tcmu-runner container when deploying ceph-iscsi by matthewoliver · Pull Request #36235 · ceph/ceph

matthewoliver · 2020-07-22T07:19:11Z

Currently when we deploy ceph-iscsi via cephadm it doesn't include a
running tcmu-runner. Which means initiators will be able to login but
you wont see the LUNS on the initiator.

This patch deploys an additional tcmu-runner container along side the
ceph-iscsi container that just runs the tcmu-runner service.

Fixes: https://tracker.ceph.com/issues/46540
Signed-off-by: Matthew Oliver moliver@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

matthewoliver · 2020-07-22T07:20:50Z

I managed to fix the problem on my dev env by manually creating a new tcmu container. This is my first attempt at a PR to do the same in cephadm. But still testing it. having some network issues to the office. So thought I'd get v 0.1 up now.

matthewoliver · 2020-07-22T07:21:49Z

src/cephadm/cephadm

+        # type: () -> CephContainer
+        tcmu_container = get_container(self.fsid, self.daemon_type, self.daemon_id)
+        tcmu_container.entrypoint = '/usr/bin/tcmu-runner'
+        tcmu_container.args.append("/usr/bin/tcmu-runner")


For some reason in my initial testing having tcmu-runner as the entry point didn't work, but if I added it as an arg it did. But that doesn't make sense, so I plan on testing this again.

src/cephadm/cephadm

sebastian-philipp · 2020-07-23T08:00:04Z

jenkins test make check

sebastian-philipp · 2020-07-23T08:00:17Z

jenkins test dashboard backend

matthewoliver · 2020-07-24T01:24:27Z

This PR now works in my env. If I loaded the orig container, I could attach the image, then if I ran the the second container everything worked. But running them both at the same time didn't.
Turned out to be the tcmu-running container needed access to dev. When starting the tcmu-runner later it must have had access to an updated /dev. When finding that out, it turns out to be an easy fix. Volume mount dev :)

src/cephadm/cephadm

sebastian-philipp · 2020-07-24T08:43:13Z

src/cephadm/cephadm

+        file_obj.write('! '+ ' '.join(container.rm_cmd(storage=True)) + '\n')
+
+    # container run command
+    file_obj.write(' '.join(container.run_cmd()) + '\n')


Suggested change

file_obj.write(' '.join(container.run_cmd()) + '\n')

file_obj.write(' '.join(container.run_cmd()) + ('&' if background else '') + '\n')

?

tchaikov

cephadm:1940: error: Type signature has too few arguments
Found 1 error in 1 file (checked 1 source file)
ERROR: InvocationError for command /home/jenkins-build/build/workspace/ceph-pull-requests/src/cephadm/.tox/mypy/bin/mypy cephadm (exited with code 1)
___________________________________ summary ____________________________________
  py3: commands succeeded
ERROR:   mypy: commands failed

Currently when we deploy ceph-iscsi via cephadm it doesn't include a running tcmu-runner. Which means initiators will be able to login but you wont see the LUNS on the initiator. This patch deploys an additional tcmu-runner container along side the ceph-iscsi container that just runs the tcmu-runner service. Fixes: https://tracker.ceph.com/issues/46540 Signed-off-by: Matthew Oliver <moliver@suse.com>

matthewoliver · 2020-07-28T03:29:15Z

thanks @tchaikov forgot to update the mypi sig when I added background=False. Fixed.

sebastian-philipp · 2020-07-28T14:51:46Z

https://pulpito.ceph.com/swagner-2020-07-28_13:34:22-rados:cephadm-wip-swagner-testing-2020-07-28-1314-distro-basic-smithi/

(failure is unrelated)

sebastian-philipp · 2020-07-28T14:52:27Z

@tchaikov ping?

dismissed

matthewoliver added cephadm wip-mattoliverau-testing labels Jul 22, 2020

matthewoliver requested a review from a team as a code owner July 22, 2020 07:19

matthewoliver commented Jul 22, 2020

View reviewed changes

sebastian-philipp reviewed Jul 22, 2020

View reviewed changes

src/cephadm/cephadm Outdated Show resolved Hide resolved

src/cephadm/cephadm Outdated Show resolved Hide resolved

src/cephadm/cephadm Show resolved Hide resolved

matthewoliver force-pushed the cephadm_iscsi_tcmu_runner branch 3 times, most recently from d9f5f9c to dd28dd1 Compare July 23, 2020 06:27

matthewoliver force-pushed the cephadm_iscsi_tcmu_runner branch from dd28dd1 to 3a4d628 Compare July 24, 2020 01:19

matthewoliver removed the wip-mattoliverau-testing label Jul 24, 2020

sebastian-philipp added the needs-qa label Jul 24, 2020

sebastian-philipp approved these changes Jul 24, 2020

View reviewed changes

tchaikov added the wip-kefu-testing label Jul 26, 2020

matthewoliver force-pushed the cephadm_iscsi_tcmu_runner branch from 3a4d628 to c04f45e Compare July 27, 2020 02:18

tchaikov previously requested changes Jul 27, 2020

View reviewed changes

tchaikov removed wip-kefu-testing needs-qa labels Jul 27, 2020

matthewoliver force-pushed the cephadm_iscsi_tcmu_runner branch from c04f45e to eb604d3 Compare July 28, 2020 03:24

tchaikov added the needs-qa label Jul 28, 2020

sebastian-philipp added the wip-swagner-testing My Teuthology tests label Jul 28, 2020

sebastian-philipp removed needs-qa wip-swagner-testing My Teuthology tests labels Jul 29, 2020

sebastian-philipp merged commit 6068455 into ceph:master Jul 29, 2020

sebastian-philipp mentioned this pull request Aug 4, 2020

octopus: cephadm batch backport August (1) #36450

Merged

	file_obj.write(' '.join(container.run_cmd()) + '\n')
	file_obj.write(' '.join(container.run_cmd()) + ('&' if background else '') + '\n')

Conversation

matthewoliver commented Jul 22, 2020

Checklist

Uh oh!

matthewoliver commented Jul 22, 2020

Uh oh!

matthewoliver Jul 22, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sebastian-philipp commented Jul 23, 2020

Uh oh!

sebastian-philipp commented Jul 23, 2020

Uh oh!

matthewoliver commented Jul 24, 2020

Uh oh!

Uh oh!

sebastian-philipp Jul 24, 2020

Choose a reason for hiding this comment

Uh oh!

tchaikov left a comment

Choose a reason for hiding this comment

Uh oh!

matthewoliver commented Jul 28, 2020

Uh oh!

sebastian-philipp commented Jul 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sebastian-philipp commented Jul 28, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sebastian-philipp commented Jul 28, 2020 •

edited

Loading