import ceph quincy 17.2.5

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/ceph/CMakeLists.txt b/ceph/CMakeLists.txt
index 5fb3601bd0231a86882d45716c7d9db081afe4ef..7ffe1065d5c44ca23a85c97d564ccc98e2f003f8 100644 (file)
--- a/ceph/CMakeLists.txt
+++ b/ceph/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(ceph
-  VERSION 17.2.4
+  VERSION 17.2.5
   LANGUAGES CXX C ASM)
 
 cmake_policy(SET CMP0028 NEW)

diff --git a/ceph/ceph.spec b/ceph/ceph.spec
index f2cac36f4e230c714b6784c2bbb840fecee29477..0e19cd6546ebbfa5f6dd9d854bb79e629563c4a2 100644 (file)
--- a/ceph/ceph.spec
+++ b/ceph/ceph.spec
@@ -162,7 +162,7 @@
 # main package definition
 #################################################################################
 Name:          ceph
-Version:       17.2.4
+Version:       17.2.5
 Release:       0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:         2
@@ -178,7 +178,7 @@ License:    LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group:         System/Filesystems
 %endif
 URL:           http://ceph.com/
-Source0:       %{?_remote_tarball_prefix}ceph-17.2.4.tar.bz2
+Source0:       %{?_remote_tarball_prefix}ceph-17.2.5.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -1266,7 +1266,7 @@ This package provides Ceph default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-17.2.4
+%autosetup -p1 -n ceph-17.2.5
 
 %build
 # Disable lto on systems that do not support symver attribute

diff --git a/ceph/changelog.upstream b/ceph/changelog.upstream
index 71c3623393762221052202a8a79c20f828c4eb79..01109229871249009fc44f823838079281d9b44f 100644 (file)
--- a/ceph/changelog.upstream
+++ b/ceph/changelog.upstream
@@ -1,3 +1,9 @@
+ceph (17.2.5-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Ceph Release Team <ceph-maintainers@ceph.io>  Mon, 17 Oct 2022 20:07:27 +0000
+
 ceph (17.2.4-1) stable; urgency=medium
 
   * New upstream release

diff --git a/ceph/src/.git_version b/ceph/src/.git_version
index 00c39bb377920b54048f2837ffa02e91a1580e8b..2389a2f81f6af33ef87149117a466619d39bf971 100644 (file)
--- a/ceph/src/.git_version
+++ b/ceph/src/.git_version
@@ -1,2 +1,2 @@
-1353ed37dec8d74973edc3d5d5908c20ad5a7332
-17.2.4
+98318ae89f1a893a6ded3a640405cdbb33e08757
+17.2.5

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py b/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py
index 06a2b3c2240876f18ec5149ec7314975b03493a9..a9eb413120df4a2214be03217ac19058ce27c294 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py
@@ -101,16 +101,16 @@ class List(object):
                                     'failed to determine if parent device {} is BlueStore. err: {}'.format(parent, e)))
                         continue
 
-                bs_info = _get_bluestore_info(dev)
-                if bs_info is None:
-                    # None is also returned in the rare event that there is an issue reading info from
-                    # a BlueStore disk, so be sure to log our assumption that it isn't bluestore
-                    logger.info('device {} does not have BlueStore information'.format(dev))
-                    continue
-                uuid = bs_info['osd_uuid']
-                if uuid not in result:
-                    result[uuid] = {}
-                result[uuid].update(bs_info)
+            bs_info = _get_bluestore_info(dev)
+            if bs_info is None:
+                # None is also returned in the rare event that there is an issue reading info from
+                # a BlueStore disk, so be sure to log our assumption that it isn't bluestore
+                logger.info('device {} does not have BlueStore information'.format(dev))
+                continue
+            uuid = bs_info['osd_uuid']
+            if uuid not in result:
+                result[uuid] = {}
+            result[uuid].update(bs_info)
 
         return result
 

diff --git a/ceph/src/osd/PeeringState.cc b/ceph/src/osd/PeeringState.cc
index 19abf2021e3f39e8d76354736adcb23f6d4fb19f..68b8d22259955dfb82455429b25b3ed8abd8fbc3 100644 (file)
--- a/ceph/src/osd/PeeringState.cc
+++ b/ceph/src/osd/PeeringState.cc
@@ -1213,14 +1213,14 @@ void PeeringState::proc_lease_ack(int from, const pg_lease_ack_t& a)
          was_min = true;
        }
        acting_readable_until_ub[i] = a.readable_until_ub;
+       break;
       }
-      break;
     }
   }
   if (was_min) {
     auto old_ru = readable_until;
     recalc_readable_until();
-    if (now >= old_ru) {
+    if (now < old_ru) {
       pl->recheck_readable();
     }
   }

diff --git a/ceph/src/pybind/mgr/rook/module.py b/ceph/src/pybind/mgr/rook/module.py
index 4300e98d502b1b39d71cf01de6bfa12a9068afb1..370cb6582199d341cd4b00d2459ace424587f899 100644 (file)
--- a/ceph/src/pybind/mgr/rook/module.py
+++ b/ceph/src/pybind/mgr/rook/module.py
@@ -351,8 +351,10 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
             all_nfs = self.rook_cluster.get_resource("cephnfses")
             nfs_pods = self.rook_cluster.describe_pods('nfs', None, None)
             for nfs in all_nfs:
-                if nfs['spec']['rados']['pool'] != NFS_POOL_NAME:
-                    continue
+                # Starting with V.17.2.0, the 'rados' spec part in 'cephnfs' resources does not contain the 'pool' item
+                if 'pool' in nfs['spec']['rados']:
+                    if nfs['spec']['rados']['pool'] != NFS_POOL_NAME:
+                        continue
                 nfs_name = nfs['metadata']['name']
                 svc = 'nfs.' + nfs_name
                 if svc in spec:

diff --git a/ceph/src/pybind/mgr/telemetry/module.py b/ceph/src/pybind/mgr/telemetry/module.py
index 779cd529b32a749a870236ad14272c9c4941ba5b..f3d49055a5ee3f0206cbd0931753951169a4c5f1 100644 (file)
--- a/ceph/src/pybind/mgr/telemetry/module.py
+++ b/ceph/src/pybind/mgr/telemetry/module.py
@@ -493,7 +493,7 @@ class Module(MgrModule):
 
         # Grab output from the "daemon.x heap stats" command
         for daemon in daemons:
-            daemon_type, daemon_id = daemon.split('.')
+            daemon_type, daemon_id = daemon.split('.', 1)
             heap_stats = self.parse_heap_stats(daemon_type, daemon_id)
             if heap_stats:
                 if (daemon_type != 'osd'):
@@ -568,7 +568,7 @@ class Module(MgrModule):
 
         # Grab output from the "dump_mempools" command
         for daemon in daemons:
-            daemon_type, daemon_id = daemon.split('.')
+            daemon_type, daemon_id = daemon.split('.', 1)
             cmd_dict = {
                 'prefix': 'dump_mempools',
                 'format': 'json'