Merge pull request ceph#53191 from rzarzynski/wip-all-kickoff-s-2

kickoff v19 squid

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(ceph
-  VERSION 18.0.0
+  VERSION 19.0.0
   LANGUAGES CXX C ASM)
 
 foreach(policy CMP0127 CMP0135)

doc/dev/release-checklists.rst

@@ -18,7 +18,7 @@ Versions and tags
 - [x] Update CMakeLists.txt VERSION (right at the top to X.0.0)
 - [x] Update src/librbd/CMakeLists.txt VERSION (librbd target at the bottom to 1.X.0)
 - [x] Update src/ceph_release with the new release name, number, and type ('dev')
-- [x] Initial tag vX.0.0 (so that we can distinguish from (and sort
+- [ ] Initial tag vX.0.0 (so that we can distinguish from (and sort
       after) the backported (X-1).2.Z versions.
 
 ### Notes on tagging
@@ -56,9 +56,9 @@ Misc
 Docs
 ~~~~
 
-- [x] Remove ``doc/releases/*.rst``. This should leave behind ``doc/releases/releases.yml`` which is used for doc building purposes.
-- [x] Cherry-pick 8cf9ad62949516666ad0f2c0bb7726ef68e4d666 ("doc: add releases links to toc"). There will be trivial conflicts.
-- [x] Add redirect for new major release at `RTD <https://readthedocs.org/dashboard/ceph/redirects/>`_.
+- [ ] Remove ``doc/releases/*.rst``. This should leave behind ``doc/releases/releases.yml`` which is used for doc building purposes.
+- [ ] Cherry-pick 8cf9ad62949516666ad0f2c0bb7726ef68e4d666 ("doc: add releases links to toc"). There will be trivial conflicts.
+- [ ] Add redirect for new major release at `RTD <https://readthedocs.org/dashboard/ceph/redirects/>`_.
 
 Feature bits
 ------------
@@ -92,6 +92,10 @@ Mon
 - [x] mon/MonCommands.h: adjust "osd require-osd-release" allows options to include X
 - [x] qa/workunits/cephtool/test.sh: adjust `require-osd-release` test
 
+OSDMap
+------
+
+- [x] src/osd/OSDMap.cc add release name mapping for `SERVER_X` in `pending_require_osd_release()`
 
 Code cleanup
 ------------
@@ -105,6 +109,8 @@ Code cleanup
 QA suite
 --------
 
+- [x] create qa/workunits/test_telemetry_(X-1).sh
+- [x] create qa/workunits/test_telemetry_(X-1)_x.sh
 - [x] create qa/suites/upgrade/(X-1)-x
 - [x] remove qa/suites/upgrade/(X-3)-x-*
 - [x] create qa/releases/X.yaml
@@ -125,21 +131,21 @@ ceph-container
 --------------
 In the `ceph/ceph-container.git` repo:
 
-- [ ] Add the release name to `Makefile`
-- [ ] Update `ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__` with the with the supported nfs-ganesha version
-- [ ] Update `contrib/build-push-ceph-container-imgs.sh` with the new release
-- [ ] Update `contrib/ceph-build-config.sh` with the release name
-- [ ] Update `contrib/common.sh` with supported version numbers
-- [ ] Update `maint-lib/ceph_version.sh` with the release name
+- [x] Add the release name to `Makefile`
+- [x] Update `ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__` with the with the supported nfs-ganesha version
+- [x] Update `contrib/build-push-ceph-container-imgs.sh` with the new release
+- [x] Update `contrib/ceph-build-config.sh` with the release name
+- [x] Update `contrib/common.sh` with supported version numbers
+- [x] Update `maint-lib/ceph_version.sh` with the release name
 
 See https://github.com/ceph/ceph-container/pull/2109 as an example for what to do.
 
 
 After dev freeze
 ================
 
-- [x] add release name to redmine (using https://tracker.ceph.com/custom_fields/16/edit)
-- [x] add release name to .github/milestone.yml for github actions to automatically add milestone to backports (this commit must be backported to the release branch)
+- [ ] add release name to redmine (using https://tracker.ceph.com/custom_fields/16/edit)
+- [ ] add release name to .github/milestone.yml for github actions to automatically add milestone to backports (this commit must be backported to the release branch)
 
 First release candidate
 =======================

qa/releases/squid.yaml

@@ -0,0 +1,6 @@
+tasks:
+- exec:
+    osd.0:
+      - ceph osd require-osd-release squid
+      - ceph osd set-require-min-compat-client squid
+- ceph.healthy:

qa/standalone/mon/misc.sh

@@ -171,7 +171,7 @@ function TEST_mon_features() {
     CEPH_ARGS="--fsid=$fsid --auth-supported=none "
     CEPH_ARGS+="--mon-host=$MONA,$MONB,$MONC "
     CEPH_ARGS+="--mon-debug-no-initial-persistent-features "
-    CEPH_ARGS+="--mon-debug-no-require-reef "
+    CEPH_ARGS+="--mon-debug-no-require-squid "
 
     run_mon $dir a --public-addr $MONA || return 1
     run_mon $dir b --public-addr $MONB || return 1
@@ -183,7 +183,7 @@ function TEST_mon_features() {
     # quorum contains two monitors
     jq_success "$jqinput" '.quorum | length == 2' || return 1
     # quorum's monitor features contain kraken, luminous, mimic, nautilus,
-    # octopus, pacific, quincy
+    # octopus, pacific, quincy, reef
     jqfilter='.features.quorum_mon[]|select(. == "kraken")'
     jq_success "$jqinput" "$jqfilter" "kraken" || return 1
     jqfilter='.features.quorum_mon[]|select(. == "luminous")'
@@ -200,6 +200,8 @@ function TEST_mon_features() {
     jq_success "$jqinput" "$jqfilter" "quincy" || return 1
     jqfilter='.features.quorum_mon[]|select(. == "reef")'
     jq_success "$jqinput" "$jqfilter" "reef" || return 1
+    jqfilter='.features.quorum_mon[]|select(. == "squid")'
+    jq_success "$jqinput" "$jqfilter" "squid" || return 1
 
     # monmap must have no persistent features set, because we
     # don't currently have a quorum made out of all the monitors
@@ -214,7 +216,7 @@ function TEST_mon_features() {
     # validate 'mon feature ls'
 
     jqinput="$(ceph mon feature ls --format=json 2>/dev/null)"
-    # k l m n o p q are supported
+    # k l m n o p q r are supported
     jqfilter='.all.supported[] | select(. == "kraken")'
     jq_success "$jqinput" "$jqfilter" "kraken" || return 1
     jqfilter='.all.supported[] | select(. == "luminous")'
@@ -231,6 +233,8 @@ function TEST_mon_features() {
     jq_success "$jqinput" "$jqfilter" "quincy" || return 1
     jqfilter='.all.supported[] | select(. == "reef")'
     jq_success "$jqinput" "$jqfilter" "reef" || return 1
+    jqfilter='.all.supported[] | select(. == "squid")'
+    jq_success "$jqinput" "$jqfilter" "squid" || return 1
 
     # start third monitor
     run_mon $dir c --public-addr $MONC || return 1
@@ -265,12 +269,14 @@ function TEST_mon_features() {
     jq_success "$jqinput" "$jqfilter" "pacific" || return 1
     jqfilter='.monmap.features.persistent[]|select(. == "elector-pinging")'
     jq_success "$jqinput" "$jqfilter" "elector-pinging" || return 1
-    jqfilter='.monmap.features.persistent | length == 10'
+    jqfilter='.monmap.features.persistent | length == 11'
     jq_success "$jqinput" "$jqfilter" || return 1
     jqfilter='.monmap.features.persistent[]|select(. == "quincy")'
     jq_success "$jqinput" "$jqfilter" "quincy" || return 1
     jqfilter='.monmap.features.persistent[]|select(. == "reef")'
     jq_success "$jqinput" "$jqfilter" "reef" || return 1
+    jqfilter='.monmap.features.persistent[]|select(. == "squid")'
+    jq_success "$jqinput" "$jqfilter" "squid" || return 1
 
     CEPH_ARGS=$CEPH_ARGS_orig
     # that's all folks. thank you for tuning in.

qa/suites/rados/thrash-old-clients/1-install/reef.yaml

@@ -0,0 +1,35 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - \(MON_DOWN\)
+tasks:
+- install:
+    branch: reef
+    exclude_packages:
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - ceph-base-debuginfo
+      - ceph-common-debuginfo
+      - ceph-immutable-object-cache-debuginfo
+      - ceph-radosgw-debuginfo
+      - ceph-test-debuginfo
+      - ceph-base-debuginfo
+      - ceph-mgr-debuginfo
+      - ceph-mds-debuginfo
+      - ceph-mon-debuginfo
+      - ceph-osd-debuginfo
+      - ceph-fuse-debuginfo
+      - librados-devel-debuginfo
+      - libcephfs2-debuginfo
+      - librados2-debuginfo
+      - librbd1-debuginfo
+      - python3-cephfs-debuginfo
+      - python3-rados-debuginfo
+      - python3-rbd-debuginfo
+      - python3-rgw-debuginfo
+      - rbd-fuse-debuginfo
+      - rbd-mirror-debuginfo
+      - rbd-nbd-debuginfo
+      - ceph-volume

qa/suites/rados/upgrade/parallel

@@ -1 +1 @@
-../../upgrade/quincy-x/parallel/
+../../upgrade/reef-x/parallel