RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-create-keys: add an argument to override default 10-minute timeout

Browse Source 
ceph-create-keys waits 10 minutes for mon quorum by default. Add an
option, -t, to override the timeout with a custom value in seconds.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
This commit is contained in:
Douglas Fuller 2017-06-30 17:46:26 +00:00
parent 58f95820e6
commit 73532825f5
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/man/8/ceph-create-keys.rst
View File

@ -9,7 +9,7 @@ ceph-create-keys -- ceph keyring generate tool
Synopsis
========
| **ceph-create-keys** [-h] [-v] [--cluster *name*] --id *id*
| **ceph-create-keys** [-h] [-v] [-t seconds] [--cluster *name*] --id *id*
Description
@ -40,6 +40,10 @@ Options
name of the cluster (default 'ceph').
.. option:: -t
time out after **seconds** (default: 600) waiting for a response from the monitor
.. option:: -i, --id
id of a ceph-mon that is coming up. **ceph-create-keys** will wait until it joins quorum.

30
src/ceph-create-keys
View File

@ -29,8 +29,8 @@ def get_ceph_gid():
gid = -1
return gid
def wait_for_quorum(cluster, mon_id):
wait_count = 600 # 10 minutes
def wait_for_quorum(cluster, mon_id, wait_count=600):
# wait 10 minutes by default
while wait_count > 0:
p = subprocess.Popen(
args=[
@ -74,10 +74,10 @@ def wait_for_quorum(cluster, mon_id):
break
if wait_count == 0:
raise SystemExit("ceph-mon was not able to join quorum within 10 minutes")
raise SystemExit("ceph-mon was not able to join quorum within %d seconds" % wait_count)
def get_key(cluster, mon_id):
def get_key(cluster, mon_id, wait_count=600):
path = '/etc/ceph/{cluster}.client.admin.keyring'.format(
cluster=cluster,
)
@ -93,7 +93,6 @@ def get_key(cluster, mon_id):
os.makedirs(pathdir)
os.chmod(pathdir, 0770)
os.chown(pathdir, get_ceph_uid(), get_ceph_gid())
wait_count = 600 # 10 minutes
while wait_count > 0:
try:
with file(tmp, 'w') as f:
@ -172,10 +171,10 @@ def get_key(cluster, mon_id):
raise
if wait_count == 0:
raise SystemExit("Could not get or create the admin key after 10 minutes")
raise SystemExit("Could not get or create the admin key after %d seconds" % wait_count)
def bootstrap_key(cluster, type_):
def bootstrap_key(cluster, type_, wait_count=600):
path = '/var/lib/ceph/bootstrap-{type}/{cluster}.keyring'.format(
type=type_,
cluster=cluster,
@ -205,7 +204,6 @@ def bootstrap_key(cluster, type_):
os.chmod(pathdir, 0770)
os.chown(pathdir, get_ceph_uid(), get_ceph_gid())
wait_count = 600 # 10 minutes
while wait_count > 0:
try:
with file(tmp, 'w') as f:
@ -237,7 +235,7 @@ def bootstrap_key(cluster, type_):
else:
raise
if wait_count == 0:
raise SystemExit("Could not get or create %s bootstrap key after 10 minutes" % type_)
raise SystemExit("Could not get or create %s bootstrap key after %d seconds" % (type_, wait_count))
def parse_args():
@ -260,8 +258,15 @@ def parse_args():
help='id of a ceph-mon that is coming up',
required=True,
)
parser.add_argument(
'--timeout', '-t',
metavar='TIMEOUT',
type=int,
help='timeout in seconds to wait',
)
parser.set_defaults(
cluster='ceph',
timeout=600,
)
parser.set_defaults(
# we want to hold on to this, for later
@ -282,20 +287,23 @@ def main():
level=loglevel,
)
wait_for_quorum(cluster=args.cluster, mon_id=args.id)
get_key(cluster=args.cluster, mon_id=args.id)
wait_for_quorum(cluster=args.cluster, mon_id=args.id, wait_count=args.timeout)
get_key(cluster=args.cluster, mon_id=args.id, wait_count=args.timeout)
bootstrap_key(
cluster=args.cluster,
type_='osd',
wait_count=args.timeout,
)
bootstrap_key(
cluster=args.cluster,
type_='rgw',
wait_count=args.timeout,
)
bootstrap_key(
cluster=args.cluster,
type_='mds',
wait_count=args.timeout,
)