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

kickoff v18 reef #47458

Merged
merged 25 commits into from Oct 4, 2022
Merged

kickoff v18 reef #47458

merged 25 commits into from Oct 4, 2022

Conversation

rzarzynski
Copy link
Contributor

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
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 cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@ljflores
Copy link
Contributor

ljflores commented Aug 4, 2022

jenkins test api

@ljflores
Copy link
Contributor

ljflores commented Aug 4, 2022

jenkins test windows

@ljflores
Copy link
Contributor

ljflores commented Aug 4, 2022

jenkins test make check

doc/dev/release-checklists.rst Outdated Show resolved Hide resolved
doc/dev/release-checklists.rst Outdated Show resolved Hide resolved
@@ -184,7 +184,8 @@ DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *do not share this bit*
DEFINE_CEPH_FEATURE(61, 1, CEPHX_V2) // 4.19, *do not share this bit*

DEFINE_CEPH_FEATURE(62, 1, RESERVED) // do not use; used as a sentinel
DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facing
DEFINE_CEPH_FEATURE_RETIRED(63, 1, RESERVED_BROKEN, LUMINOUS, QUINCY) // client-facing
// available
Copy link
Contributor

Choose a reason for hiding this comment

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

X-3 == R-3 == Octopus

I don't think RESERVED_BROKEN was tied to Octopus or the "X-3" rule. But deciding that it has been long enough for OSD_SNAPMAPPER workaround to go away entirely is fine too :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If we can retire this bit, let's go for it.

Just to the record the meaning of the macros' params:

// this bit is ignored but still advertised by release *when*
#define DEFINE_CEPH_FEATURE_DEPRECATED(bit, incarnation, name, when) \
        const static uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
        const static uint64_t DEPRECATED_CEPH_FEATUREMASK_##name =              \
                (1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);

// this bit is ignored by release *unused* and not advertised by
// release *unadvertised*
#define DEFINE_CEPH_FEATURE_RETIRED(bit, inc, name, unused, unadvertised)

src/mon/Monitor.h Outdated Show resolved Hide resolved
src/mon/OSDMonitor.cc Outdated Show resolved Hide resolved
@rzarzynski
Copy link
Contributor Author

The make check bot failed early:

  C++20 support requires a minimum Clang version of 12.

@rzarzynski
Copy link
Contributor Author

jenkins test make check

@cbodley
Copy link
Contributor

cbodley commented Aug 11, 2022

cc @tchaikov motr still causing 'make check' failures:

/ceph-pull-requests/src/rgw/rgw_sal.cc
In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_sal.cc:33:
In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_sal_motr.h:25:
In file included from /usr/include/motr/motr/client.h:1875:
/usr/include/motr/cas/cas.h:38:10: fatal error: 'fop/wire.h' file not found
#include "fop/wire.h"           /* m0_fop_mod_rep */
         ^~~~~~~~~~~~
1 error generated.

i've opened #47564 to disable WITH_RADOSGW_MOTR in make check until we stabilize our CI

@tchaikov
Copy link
Contributor

tchaikov commented Aug 12, 2022

@cbodley turns out cortx-motr upstreams debian packaging receipt is buggy, and missing that file. just added it and reupload the deb packages.

diff --git a/debian/cortx-motr-dev.install b/debian/cortx-motr-dev.install
index 6c7dfb54..33414fe0 100644
--- a/debian/cortx-motr-dev.install
+++ b/debian/cortx-motr-dev.install
@@ -239,6 +239,7 @@ usr/include/motr/fop/fom_simple.h
 usr/include/motr/fop/fop.h
 usr/include/motr/fop/fop_item_type.h
 usr/include/motr/fop/ut/iterator_test_xc.h
+usr/include/motr/fop/wire.h
 usr/include/motr/format/format.h
 usr/include/motr/format/format_xc.h
 usr/include/motr/graph/graph.h

patch upstreamed at Seagate/cortx-motr#2074

@idryomov
Copy link
Contributor

"make check" failure pertains to this PR:

/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/monmaptool/feature-set-unset-list.t: failed
--- /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/monmaptool/feature-set-unset-list.t
+++ /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/monmaptool/feature-set-unset-list.t.err
@@ -12,21 +12,21 @@
       required:   [none]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
   MONMAP FEATURES:
       persistent: [none]
       optional:   [none]
       required:   [none]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
   monmap:persistent:[none]
   monmap:optional:[none]
   monmap:required:[none]
-  available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-  available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+  available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+  available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
 
   $ monmaptool --feature-set foo /tmp/test.monmap.1234
   unknown features name 'foo' or unable to parse value: Expected option value to be integer, got 'foo'
@@ -45,8 +45,8 @@
       required:   [kraken(1),octopus(32),unknown(4096)]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
 
   $ monmaptool --feature-unset 32 --optional --feature-list /tmp/test.monmap.1234
   monmaptool: monmap file /tmp/test.monmap.1234
@@ -56,8 +56,8 @@
       required:   [kraken(1),octopus(32),unknown(4096)]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ monmaptool --feature-unset 32 --persistent --feature-unset 4096 --optional --feature-list /tmp/test.monmap.1234
@@ -68,8 +68,8 @@
       required:   [kraken(1)]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ monmaptool --feature-unset kraken --feature-list /tmp/test.monmap.1234
@@ -80,8 +80,8 @@
       required:   [none]
   
   AVAILABLE FEATURES:
-      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
-      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256)]
+      supported:  [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
+      persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ rm /tmp/test.monmap.1234

@rzarzynski
Copy link
Contributor Author

Added reef to feature-set-unset-list.t and extended the checklist to cover this step as well.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
@rzarzynski
Copy link
Contributor Author

Resolved a merge conflict with acd6d4e on qa/suites/upgrade/octopus-x/rgw-multisite/realm.yaml – we both were removing this file.

@rzarzynski
Copy link
Contributor Author

/home/jenkins-build/build/workspace/ceph-pr-docs/doc/dev/release-checklists.rst:25: ERROR: Unexpected indentation.
/home/jenkins-build/build/workspace/ceph-pr-docs/doc/dev/release-checklists.rst:26: WARNING: Block quote ends without a blank line; unexpected unindent.
looking for now-outdated files... none found
pickling environment... done
checking consistency... done
preparing documents... done

Fixing. No other things than just the release-checklist.rst will be affected.

…omplete.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
…nt) == 10

Also updates the release checklist.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
@rzarzynski
Copy link
Contributor Author

Absolutely no other changes except the doc's indentation:

commit 65d911cc9bdc393a546ba553e3c9189a8f7e32c1
Author: Radoslaw Zarzynski <rzarzynski@redhat.com>
Date:   Tue Oct 4 00:27:12 2022 +0200

    fixup
    
    Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index bb4bc5bd3c2..4b7817b1dcc 100644
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -21,13 +21,12 @@ Versions and tags
       after) the backported (X-1).2.Z versions.
 
 ### Notes on tagging
-* Tags must be annonated as CMake determines `CEPH_GIT_NICE_VER` by calling
-  `git describe --always`.
+* Tags must be annonated as CMake determines `CEPH_GIT_NICE_VER` by
+calling `git describe --always`.
 * vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n
-  which are handled by Jenkins).
+which are handled by Jenkins).
 * vX.0.0 should point to a commit before the first one in a kickoff branch.
 
-
 Define release names and constants

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
@idryomov idryomov requested a review from a team as a code owner October 4, 2022 12:20
@github-actions github-actions bot added the rbd label Oct 4, 2022
@idryomov
Copy link
Contributor

idryomov commented Oct 4, 2022

Bumped librbd version and added respective items to the checklist.

@ljflores
Copy link
Contributor

ljflores commented Oct 4, 2022

jenkins retest this please

@ljflores
Copy link
Contributor

ljflores commented Oct 4, 2022

@rzarzynski I only found one related failure. But I think you fixed it in a subsequent commit since it passed in the rerun. And I see the commit on your branch.
http://pulpito.front.sepia.ceph.com/yuriw-2022-09-29_16:40:30-rados-wip-all-kickoff-r-distro-default-smithi/7047967/

2022-09-29T20:41:39.878 INFO:tasks.workunit.client.0.smithi164.stderr://home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2321: jq_success:  echo '
2022-09-29T20:41:39.879 INFO:tasks.workunit.client.0.smithi164.stderr:{"election_epoch":14,"quorum":[0,1,2],"quorum_names":["a","b","c"],"quorum_leader_name":"a","quorum_age":4,"features":{"quorum_con":"4540138322906710015","quorum_mon":["kraken","luminous","mimic","osdmap-prune","nautilus","octopus","pacific","elector-pinging","quincy","reef"]},"monmap":{"epoch":3,"fsid":"2a5cab5f-e7e2-46a5-ac28-ea1b6b85400e","modified":"2022-09-29T20:41:29.707699Z","created":"2022-09-29T20:40:55.456287Z","min_mon_release":18,"min_mon_release_name":"reef","election_strategy":1,"disallowed_leaders: ":"","stretch_mode":false,"tiebreaker_mon":"","features":{"persistent":["kraken","luminous","mimic","osdmap-prune","nautilus","octopus","pacific","elector-pinging","quincy","reef"],"optional":[]},"mons":[{"rank":0,"name":"a","public_addrs":{"addrvec":[{"type":"v2","addr":"127.0.0.1:7127","nonce":0}]},"addr":"127.0.0.1:7127/0","public_addr":"127.0.0.1:7127/0","priority":0,"weight":0,"crush_location":"{}"},{"rank":1,"name":"b","public_addrs":{"addrvec":[{"type":"v2","addr":"127.0.0.1:7128","nonce":0}]},"addr":"127.0.0.1:7128/0","public_addr":"127.0.0.1:7128/0","priority":0,"weight":0,"crush_location":"{}"},{"rank":2,"name":"c","public_addrs":{"addrvec":[{"type":"v2","addr":"127.0.0.1:7129","nonce":0}]},"addr":"127.0.0.1:7129/0","public_addr":"127.0.0.1:7129/0","priority":0,"weight":0,"crush_location":"{}"}]}}'
2022-09-29T20:41:39.879 INFO:tasks.workunit.client.0.smithi164.stderr://home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2321: jq_success:  jq '.monmap.features.persistent | length == 9'
2022-09-29T20:41:39.906 INFO:tasks.workunit.client.0.smithi164.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2321: jq_success:  ret=false
2022-09-29T20:41:39.907 INFO:tasks.workunit.client.0.smithi164.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2322: jq_success:  [[ false == \t\r\u\e ]]
2022-09-29T20:41:39.907 INFO:tasks.workunit.client.0.smithi164.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2324: jq_success:  [[ -n "" ]]
2022-09-29T20:41:39.907 INFO:tasks.workunit.client.0.smithi164.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2325: jq_success:  [[ false == \"\" ]]
2022-09-29T20:41:39.907 INFO:tasks.workunit.client.0.smithi164.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/ceph-helpers.sh:2329: jq_success:  return 1
2022-09-29T20:41:39.908 INFO:tasks.workunit.client.0.smithi164.stderr:/home/ubuntu/cephtest/clone.client.0/qa/standalone/mon/misc.sh:270: TEST_mon_features:  return 1

Rados suite review:
http://pulpito.front.sepia.ceph.com/?branch=wip-all-kickoff-r

Failures, unrelated:
1. https://tracker.ceph.com/issues/57386
2. https://tracker.ceph.com/issues/52321
3. https://tracker.ceph.com/issues/57731
4. https://tracker.ceph.com/issues/57311
5. https://tracker.ceph.com/issues/50042
6. https://tracker.ceph.com/issues/57546

Details:
1. cephadm/test_dashboard_e2e.sh: Expected to find content: '/^foo$/' within the selector: 'cd-modal .badge' but never did - Ceph - Mgr - Dashboard
2. qa/tasks/rook times out: 'check osd count' reached maximum tries (90) after waiting for 900 seconds - Ceph - Orchestrator
3. Problem: package container-selinux conflicts with udica < 0.2.6-1 provided by udica-0.2.4-1 - Infrastructure
4. rook: ensure CRDs are installed first - Ceph - Orchestrator
5. rados/test.sh: api_watch_notify failures - Ceph - RADOS
6. rados/thrash-erasure-code: wait_for_recovery timeout due to "active+clean+remapped+laggy" pgs - Ceph - RADOS

@rzarzynski rzarzynski merged commit bf46d37 into ceph:main Oct 4, 2022
guits added a commit to ceph/ceph-ansible that referenced this pull request Oct 7, 2022
Since ceph/ceph/pull/47458 has been merged, this check must be updated.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
guits added a commit to ceph/ceph-ansible that referenced this pull request Oct 7, 2022
Since ceph/ceph/pull/47458 has been merged, this task needs to be updated.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
guits added a commit to ceph/ceph-ansible that referenced this pull request Oct 7, 2022
align with ceph/ceph/pull/47458 since it has been merged.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
guits added a commit to ceph/ceph-ansible that referenced this pull request Oct 7, 2022
align with ceph/ceph/pull/47458 since it has been merged.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
guits added a commit to ceph/ceph-ansible that referenced this pull request Oct 7, 2022
align with ceph/ceph/pull/47458 since it has been merged.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
@travisn
Copy link
Member

travisn commented Oct 10, 2022

Rook daily tests against Ceph main are green since this is merged and Rook can detect the Reef version, thanks!

@cbodley
Copy link
Contributor

cbodley commented Feb 17, 2023

yikes, i hadn't noticed that this PR inadvertently removed rgw from the upgrade suites entirely. are the upgrade suites cephadm-only now? i've opened https://tracker.ceph.com/issues/58782 to track this

@cbodley
Copy link
Contributor

cbodley commented Feb 17, 2023

okay, i see this just removed all octopus-x upgrade suites, and we never made any "no-cephadm" upgrade suites after that

stuartgrace-bbc pushed a commit to bbc/ceph-ansible that referenced this pull request Jan 30, 2024
align with ceph/ceph/pull/47458 since it has been merged.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet