From a7ff510c187aea857ad64063b162e57c17b8da3a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 8 Oct 2019 07:28:23 -0500 Subject: [PATCH] Revert "ceph-volume: accept --no-tmpfs argument for bluestore" This reverts commit e6c578a2bc1e5b6d91676274444122c5388bddc0. It turns out this change isn't actually needed to make ceph-daemon do its thing, since ceph-volume alrady skips doing anything with tmpfs if the data dir already exists. Signed-off-by: Sage Weil --- .../ceph_volume/devices/lvm/activate.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index d1a5a4035ef5..d46db9edfa58 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -121,7 +121,7 @@ def get_osd_device_path(osd_lv, lvs, device_type, dmcrypt_secret=None): raise RuntimeError('could not find %s with uuid %s' % (device_type, device_uuid)) -def activate_bluestore(lvs, no_systemd=False, no_tmpfs=False): +def activate_bluestore(lvs, no_systemd=False): # find the osd osd_lv = lvs.get(lv_tags={'ceph.type': 'block'}) if not osd_lv: @@ -136,7 +136,7 @@ def activate_bluestore(lvs, no_systemd=False, no_tmpfs=False): osd_path = '/var/lib/ceph/osd/%s-%s' % (conf.cluster, osd_id) if not system.path_is_mounted(osd_path): # mkdir -p and mount as tmpfs - prepare_utils.create_osd_path(osd_id, tmpfs=(not no_tmpfs)) + prepare_utils.create_osd_path(osd_id, tmpfs=True) # XXX This needs to be removed once ceph-bluestore-tool can deal with # symlinks that exist in the osd dir for link_name in ['block', 'block.db', 'block.wal']: @@ -260,13 +260,9 @@ class Activate(object): logger.info('found a journal associated with the OSD, assuming filestore') return activate_filestore(lvs, no_systemd=args.no_systemd) logger.info('unable to find a journal associated with the OSD, assuming bluestore') - return activate_bluestore(lvs, - no_systemd=args.no_systemd, - no_tmpfs=args.no_tmpfs) + return activate_bluestore(lvs, no_systemd=args.no_systemd) if args.bluestore: - activate_bluestore(lvs, - no_systemd=args.no_systemd, - no_tmpfs=args.no_tmpfs) + activate_bluestore(lvs, no_systemd=args.no_systemd) elif args.filestore: activate_filestore(lvs, no_systemd=args.no_systemd) @@ -331,12 +327,6 @@ class Activate(object): action='store_true', help='Skip creating and enabling systemd units and starting OSD services', ) - parser.add_argument( - '--no-tmpfs', - dest='no_tmpfs', - action='store_true', - help='Do not create a tmpfs for the OSD directory', - ) if len(self.argv) == 0: print(sub_command_help) return -- 2.47.3