RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 00:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: add --mark-out option on deactivate feature.

Browse Source 
- Using `--mark-out` option to mark osd out when
    deactivate this osd instead of always mark osd out.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
This commit is contained in:
Vicente Cheng 2015-09-11 11:33:13 +08:00
parent be471a2994
commit 7ca8d1daed
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ceph-disk
View File

@ -61,7 +61,7 @@ Activate:
- triggered on ceph service startup with 'ceph-disk activate-all'
Deactivate:
- stop ceph-osd service if needed (If osd still in osd map, make it out first)
- stop ceph-osd service if needed (make osd out with option --mark-out)
- remove 'ready', 'active', and INIT-specific files
- remove gpt partition type and change partition name (prevent triggered by udev)
- create deactive flag
@ -2743,10 +2743,12 @@ def main_deactivate(args):
# Do not do anything if osd is already down.
status_code = _check_osd_status(args.cluster, args.osd_id)
if status_code == OSD_STATUS_IN_UP:
_mark_osd_out(args.cluster, args.osd_id)
if args.mark_out is True:
_mark_osd_out(args.cluster, args.osd_id)
stop_daemon(args.cluster, args.osd_id)
elif status_code == OSD_STATUS_IN_DOWN:
_mark_osd_out(args.cluster, args.osd_id)
if args.mark_out is True:
_mark_osd_out(args.cluster, args.osd_id)
elif status_code == OSD_STATUS_OUT_UP:
stop_daemon(args.cluster, args.osd_id)
elif status_code == OSD_STATUS_OUT_DOWN:
@ -3958,6 +3960,11 @@ def make_deactivate_parser(subparsers):
metavar='OSDID',
help='ID of OSD to deactivate'
)
deactivate_parser.add_argument(
'--mark-out',
action='store_true', default=False,
help='option to mark this osd out',
)
deactivate_parser.set_defaults(
func=main_deactivate,
)