diff -Nru ceph-iscsi-3.4/debian/changelog ceph-iscsi-3.4/debian/changelog --- ceph-iscsi-3.4/debian/changelog 2020-02-26 12:23:17.000000000 +0000 +++ ceph-iscsi-3.4/debian/changelog 2022-02-22 15:12:55.000000000 +0000 @@ -1,3 +1,10 @@ +ceph-iscsi (3.4-0ubuntu3) focal; urgency=medium + + * d/p/ceph-rm-blacklist-decode.patch: Remove attempt to look for + string in a byte type (LP: #1883112). + + -- Liam Young Tue, 22 Feb 2022 15:12:55 +0000 + ceph-iscsi (3.4-0ubuntu2) focal; urgency=medium * d/p/ubuntu-support.patch: Ensure Ubuntu >= 18.04 is in the list of diff -Nru ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch --- ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch 1970-01-01 01:00:00.000000000 +0100 +++ ceph-iscsi-3.4/debian/patches/ceph-rm-blacklist-decode.patch 2022-02-22 15:12:45.000000000 +0000 @@ -0,0 +1,41 @@ +--- a/ceph_iscsi_config/gateway.py ++++ b/ceph_iscsi_config/gateway.py +@@ -37,24 +37,26 @@ + "{}".format(blacklisted_ip)) + + conf = settings.config +- result = subprocess.check_output("ceph -n {client_name} --conf {cephconf} " +- "osd blacklist rm {blacklisted_ip}". +- format(blacklisted_ip=blacklisted_ip, +- client_name=conf.cluster_client_name, +- cephconf=conf.cephconf), +- stderr=subprocess.STDOUT, shell=True) +- if ("un-blacklisting" in result) or ("isn't blacklisted" in result): +- self.logger.info("Successfully removed blacklist entry") +- return True +- else: +- self.logger.critical("blacklist removal failed. Run" ++ try: ++ subprocess.check_output("ceph -n {client_name} --conf {cephconf} " ++ "osd blacklist rm {blacklisted_ip}". ++ format(blacklisted_ip=blacklisted_ip, ++ client_name=conf.cluster_client_name, ++ cephconf=conf.cephconf), ++ stderr=subprocess.STDOUT, shell=True) ++ except subprocess.CalledProcessError as err: ++ self.logger.critical("blacklist removal failed: {}. Run" + " 'ceph -n {client_name} --conf {cephconf} " + "osd blacklist rm {blacklisted_ip}'". +- format(blacklisted_ip=blacklisted_ip, ++ format(err.output.decode('utf-8').strip(), ++ blacklisted_ip=blacklisted_ip, + client_name=conf.cluster_client_name, + cephconf=conf.cephconf)) + return False + ++ self.logger.info("Successfully removed blacklist entry") ++ return True ++ + def osd_blacklist_cleanup(self): + """ + Process the osd's to see if there are any blacklist entries for this diff -Nru ceph-iscsi-3.4/debian/patches/series ceph-iscsi-3.4/debian/patches/series --- ceph-iscsi-3.4/debian/patches/series 2020-02-26 12:16:11.000000000 +0000 +++ ceph-iscsi-3.4/debian/patches/series 2022-02-22 14:54:15.000000000 +0000 @@ -1,2 +1,3 @@ 0001-Replace-etc-sysconfig-ceph-by-etc-default-ceph-in-se.patch ubuntu-support.patch +ceph-rm-blacklist-decode.patch