From: Michael Fritch <mfritch@suse.com>
Date: Sun, 24 Nov 2019 01:05:40 +0000 (-0700)
Subject: ceph-daemon: use 'iglob' instead of 'glob'
X-Git-Tag: v15.1.0~725^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c93a30f08437b9fd214ba99d54d09ea457c461e5;p=ceph.git

ceph-daemon: use 'iglob' instead of 'glob'

Use a glob iterator for instances where the matched pathnames return a
very long list of files.

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index dabfd6a85222..2fccc9d5a694 100755
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -61,7 +61,7 @@ import uuid
 
 from distutils.spawn import find_executable
 from functools import wraps
-from glob import glob
+from glob import iglob
 
 
 container_path = None
@@ -1515,7 +1515,7 @@ def command_adopt():
                         (daemon_type, args.cluster, daemon_id))
         data_dir_src = os.path.abspath(args.legacy_dir + data_dir_src)
         data_dir_dst = make_data_dir(fsid, daemon_type, daemon_id)
-        for data_file in glob(os.path.join(data_dir_src, '*')):
+        for data_file in iglob(os.path.join(data_dir_src, '*')):
             move_file(data_file, data_dir_dst)
         logger.debug('Remove dir \'%s\'' % (data_dir_src))
         if os.path.ismount(data_dir_src):
@@ -1535,7 +1535,7 @@ def command_adopt():
                         (args.cluster, daemon_type, daemon_id))
         log_dir_src = os.path.abspath(args.legacy_dir + log_dir_src)
         log_dir_dst = make_log_dir(fsid, uid=uid, gid=gid)
-        for log_file in glob(log_dir_src):
+        for log_file in iglob(log_dir_src):
             move_file(log_file, log_dir_dst)
 
         logger.info('Creating new units...')