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.

Sign up for GitHub

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

Jump to bottom

Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init" #39482

Merged
merged 1 commit into from Feb 15, 2021
Merged

Revert "Merge pull request #37764 from mgfritch/cephadm-no-container-init" #39482

merged 1 commit into from Feb 15, 2021

Conversation

liewegas
Copy link
Member

This reverts commit f635555, reversing
changes made to d4d3d17.

This PR seems to be (indirectly?) responsible for
https://tracker.ceph.com/issues/49237

Also, it was causing the rados.py task's follow-up step to wait
for snap trimming to fail: it would time out a 'ceph osd dump --format=json'
command. :/

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 api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@liewegas
Revert "Merge pull request ceph#37764 from mgfritch/cephadm-no-contai…
c896292 
…ner-init"

This reverts commit f635555, reversing
changes made to d4d3d17.

This PR seems to be (indirectly?) responsible for
  https://tracker.ceph.com/issues/49237

Also, it was causing the rados.py task's follow-up step to wait
for snap trimming to fail: it would time out a 'ceph osd dump --format=json'
command.  :/

Signed-off-by: Sage Weil <sage@newdream.net>
@liewegas liewegas requested a review from a team as a code owner February 15, 2021 17:42
jdurgin
jdurgin approved these changes Feb 15, 2021
View reviewed changes
Copy link
Member

@jdurgin jdurgin left a comment

Choose a reason for hiding this comment

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

agreed we should get the tests passing with this, then figure out what the issues are with redoing this

@liewegas liewegas merged commit 9200b1e into ceph:master Feb 15, 2021
@liewegas liewegas deleted the no-cephadm-init branch February 15, 2021 21:40
@badone
Copy link
Contributor

badone commented Feb 16, 2021

Just noting here that this PR seems to have resolved https://tracker.ceph.com/issues/49259 implying that the original PR was somehow responsible for that as well.

mgfritch added a commit to mgfritch/ceph that referenced this pull request Feb 17, 2021
@mgfritch
Revert "Merge PR ceph#39482 into master"
d5d0b80 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
@jmolmo jmolmo mentioned this pull request Feb 18, 2021
Closed
liewegas added a commit to liewegas/ceph that referenced this pull request Feb 27, 2021
@liewegas
Revert "Merge PR ceph#39482 into master"
f760336 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
liewegas added a commit to liewegas/ceph that referenced this pull request Feb 27, 2021
@liewegas
Revert "Merge PR ceph#39482 into master"
2d3f64f 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
liewegas added a commit to liewegas/ceph that referenced this pull request Feb 28, 2021
@liewegas
Revert "Merge PR ceph#39482 into master"
00b3a3f 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
liewegas added a commit to liewegas/ceph that referenced this pull request Mar 1, 2021
@liewegas
Revert "Merge PR ceph#39482 into master"
718d6ce 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
liewegas added a commit to liewegas/ceph that referenced this pull request Mar 1, 2021
@liewegas
Revert "Merge PR ceph#39482 into master"
58a086a 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
liewegas added a commit to liewegas/ceph that referenced this pull request Mar 1, 2021
@liewegas
Revert "Merge PR ceph#39482 into master"
a16e46e 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
liewegas added a commit that referenced this pull request Mar 2, 2021
@liewegas
Merge PR #39739 into master
65724b1 
* refs/pull/39739/head:
	cephadm: set CEPH_USE_RANDOM_NONCE if using --init
	msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1
	Revert "Merge PR #39482 into master"

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
sebastian-philipp pushed a commit to sebastian-philipp/ceph that referenced this pull request Mar 3, 2021
@liewegas @sebastian-philipp
Revert "Merge PR ceph#39482 into master"
35dc4b6 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a16e46e)
sebastian-philipp pushed a commit to sebastian-philipp/ceph that referenced this pull request Mar 4, 2021
@liewegas @sebastian-philipp
Revert "Merge PR ceph#39482 into master"
d86b871 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a16e46e)
sebastian-philipp pushed a commit to sebastian-philipp/ceph that referenced this pull request Mar 4, 2021
@liewegas @sebastian-philipp
Revert "Merge PR ceph#39482 into master"
67325d2 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a16e46e)
sebastian-philipp pushed a commit to sebastian-philipp/ceph that referenced this pull request Mar 9, 2021
@liewegas @sebastian-philipp
Revert "Merge PR ceph#39482 into master"
4744798 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a16e46e)
sebastian-philipp pushed a commit to sebastian-philipp/ceph that referenced this pull request Mar 9, 2021
@liewegas @sebastian-philipp
Revert "Merge PR ceph#39482 into master"
091ad21 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a16e46e)
liewegas added a commit that referenced this pull request Mar 10, 2021
@liewegas
Merge PR #39807 into pacific
2768f3b 
* refs/pull/39807/head:
	cephadm: split custom container args into argv
	cephadm: fix escaping/quoting of stderr-prefix arg for ceph daemons
	cephadm: set CEPH_USE_RANDOM_NONCE if using --init
	msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1
	Revert "Merge PR #39482 into master"
	cephadm: remove redundant `ERROR` during check-host
	cephadm: remove unused imports
	cephadm: `cephadm ls` broken for SUSE downstream alertmanager container
	cephadm: `cephadm ls` broken for SUSE downstream alertmanager container
	mgr/cephadm: add ok-to-stop functions for ceph client services
	mgr/test_orchestrator: Refactor create_osds
	mgr/volumes: adapt to now orch interface
	doc/mgr/orchestrator_modules: adapt to now orch interface
	mgr/selftest: adapt to now orch interface
	mgr/dashboard: adapt to now orch interface
	mgr/mds_autoscaler: Add to tox.ini
	mgr/mds_autoscaler: adapt to now orch interface
	mgr/test_orchestrator: adapt to now orch interface
	mgr/rook: Adapt to new orch interface
	mgr/cephadm: Adapt cephadm to new orch interface
	mgr/orch: Remove old tests
	mgr/orch: adapt orchestrator CLI to new interface
	mgr/orch: replace Completion with OrchResult(Generic[T])
	mgr/orchestrator: Fix ceph orch ls in Rook
	doc/cephadm: rewrite "install cephadm"
	doc/cephadm: rewrite "b.strap a new cluster"
	cephadm: add docker.service dependency in systemd units
	cephadm: add multi-digest test
	mgr/orchestrator: validate config options at apply time
	mgr/cephadm: disallow managed options in ServiceSpec config section
	mgr/cephadm: add config section to ServiceSpec
	doc/cephadm: s/togeter/together
	cephadm: provide meta during bootstrap
	mgr/cephadm: put service_name in unit.meta and use it when available
	cephadm: accept arbitrary dict via --meta-json
	mgr/cephadm: incorporte memory_{usage,request,limit} from 'ls'
	cephadm: accept --memory-{request,limit}
	cephadm: include memory_usage in 'ls' output
	doc/cephadm: remove Orchestrator CLI from cephadm toc
	doc/cephadm: move host labels to host mgmt
	doc/cephadm: group MDS sections into one chapter
	doc/cephadm: Add iscsi
	doc/cephadm: group NFS sections into one chapter
	doc/cephadm: rename monitoring chapter title
	doc/cephadm: group MON sections into one chapter
	doc/cephadm: make custom containers its own chapter
	doc/cephadm: group RGW mgmt sections into one chapter
	doc/cephadm: move scheduler topic to service mgmt
	doc/cephadm: move unmanaged=true to service-mgmt.rst
	doc/cephadm: group general service mgmt sections into one chapter
	doc/cephadm: group OSD mgmt sections into one chapter
	doc/cephadm: Move FQDN chapter to host mgmt.rst
	doc/cephadm: Move SSH config from operations to host-mgmt.rst
	doc/cephadm: group host mgmt sections into one chapter
	cephadm: fix bug in orphan-initial-daemons logic
	mgr/orch: drop __all__ from __init__.py
	mgr/cephadm: add DaemonDescriptionStatus
	cephadm: version command hide traceback when login is needed
	doc/cephadm: troubleshooting: manually deploy MGR
	cephadm: fix port_in_use when IPv6 is disabled
	cephadm: Allow to use paths in all <_devices> drivegroup sections
	mgr/cephadm: error if service action called with daemonless service
	mgr/cephadm: fix up the strings reporting osd ids
	mgr/cephadm: remove daemon before osd destroy/purge
	mgr/cephadm: simplify OSD __str__ for drain
	mgr/cephadm: make drain adjust crush weight if not replacing
	mgr/cephadm: less log noise from osd drain code
	mgr/cephadm: fix 'orch daemon add osd ...'
	mgr/cephadm/upgrade: fix typo
	mgr/cephadm: remove spec from CephadmDaemonDeploySpec
	mgr/cephadm/upgrade: restart mgr after mons upgrade to pacific
	mgr/cephadm: use get_foreign_ceph_option() instead of 'config get' mon command

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdurgin jdurgin jdurgin approved these changes

Assignees
No one assigned
Labels
cephadm documentation pybind wip-sage2-testing wip-sage-testing
Projects
None yet
Milestone
No milestone
3 participants
@liewegas @badone @jdurgin