Merge branch 'wip-67299-quincy' of https://github.com/neesingh-rh/ceph into wip-hemanth-testing-2024-08-14-1817-quincy

Author: hkadam134

qa/tasks/cephfs/test_misc.py

@@ -401,7 +401,13 @@ def test_session_ls(self):
 
     def test_client_ls(self):
         self._session_client_ls(['client', 'ls'])
-        
+
+    def test_ceph_tell_for_unknown_cephname_type(self):
+        with self.assertRaises(CommandFailedError) as ce:
+            self.run_ceph_cmd('tell', 'cephfs.c', 'something')
+        self.assertEqual(ce.exception.exitstatus, 1)
+
+
 class TestCacheDrop(CephFSTestCase):
     CLIENTS_REQUIRED = 1
 

src/pybind/ceph_argparse.py

@@ -502,13 +502,13 @@ def valid(self, s, partial=False):
         try:
             poolid = int(poolid_s)
         except ValueError:
-            raise ArgumentFormat('pool {0} not integer'.format(poolid))
+            raise ArgumentFormat('pool {0} not integer'.format(poolid_s))
         if poolid < 0:
             raise ArgumentFormat('pool {0} < 0'.format(poolid))
         try:
             pgnum = int(pgnum_s, 16)
         except ValueError:
-            raise ArgumentFormat('pgnum {0} not hex integer'.format(pgnum))
+            raise ArgumentFormat('pgnum {0} not hex integer'.format(pgnum_s))
         self.val = s
 
     def __str__(self):