Commit Graph

493 Commits

Author SHA1 Message Date
Patrick Donnelly
06e2cec1ea
Merge PR #17678 into master
* refs/pull/17678/head:
	mon/AuthMonitor: improve error message
	mon/OSDMonitor: disallow "all" as a key or value name
	cephfs, mon/AuthMonitor, OSD/osdcap: make 'all' a synonym for '*'
	vstart.sh: Create an admin user for each CephFS
	mon/AuthMonitor: Allow * wildcard for filesystem name
	OSD/OSDCap: Allow namespace and pool tag to be combined
	OSD/OSDCap: Namespace globbing
	mon/AuthMonitor: Use new osd auth caps for ceph fs authorize
	OSD/auth caps: Add OSD auth caps based on pool tag
	mon/FSCommands: Tag pools used for cephfs by default
	mon/OSDMonitor: Add key/value arguments for pool tagging

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-21 13:49:24 -08:00
Douglas Fuller
d8c05680a5 vstart.sh: Create an admin user for each CephFS
Issue a ceph fs authorize command for a new user corresponding to each
CephFS created.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2017-11-13 13:18:35 -05:00
iliul
c4327eb3bb vstart.sh: fix a spelling mistake
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-11-04 12:17:58 +00:00
Kefu Chai
eb022652c6 vstart.sh: drop --{mon,osd,mds,rgw,mgr}_num options
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 18:53:16 +08:00
Douglas Fuller
ea4249b568 OSD/auth caps: Add OSD auth caps based on pool tag
Extend the OSD auth caps syntax to include RADOS pool tags. New syntax:

allow rw tag <application> <key>=<value>

Access is granted if the pool contains the <key>:<value> in its
application metadata.

Feature: http://tracker.ceph.com/issues/21084
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2017-10-25 15:34:13 -04:00
Kefu Chai
5277240d87 vstart.sh: should quote the parameters to get them quoted
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-25 10:19:14 +08:00
Josh Durgin
df7a694896 Merge pull request #18181 from tchaikov/wip-vstart-quoted-print
vstart.sh: quote command only when necessary

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-24 16:43:38 -07:00
Kefu Chai
21cf1eb4fd Merge pull request #18256 from liewegas/wip-bluestore-superblock
os/bluestore: allow reconstruction of osd data dir from bluestore bdev label

Reviewed-By: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:51:18 +08:00
Sage Weil
d4e0c46d89 vstart.sh: specify block files
This is mostly just to test ceph-bluestore-tool prime-osd-dir.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 10:56:25 -05:00
Sage Weil
65b707358e osd: store osd cephx key in "osd_key" meta slot
Note that this *only* works with --mkkey (deprecated except for
vstart.sh) and --key <key>.  If you write out a full keyring before
running --mkfs it doesn't get populated.  Users should pass --key
instead of --keyring in that case.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 10:56:25 -05:00
Yan Jun
96b82796ca vstart.sh: move rgw configuration to client.rgw section
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-10-16 23:39:37 +08:00
Kefu Chai
169e1597f9 vstart.sh: quote command only when necessary
we quote the command args, so it's easier to copy and paste it to rerun
the command. but it's annoying to read the echod command with the
quotes. so quote them only if the arg has space in it, it'd easier for
eyes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-09 17:42:00 +08:00
Orit Wasserman
8ef45de6af Merge pull request #17989 from mkogan1/wip-rgw-21151
rgw: update vstart.sh to support rgw ssl port notation : '--rgw_port 443s'
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-10-01 11:39:33 +03:00
Sage Weil
c59efe0a2b Merge pull request #17839 from liewegas/wip-recovery-preemption
osd: allow PG recovery scheduling preemption

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-09-28 14:14:01 -05:00
Mark Kogan
39fa911663 rgw: update vstart.sh to support ssl port notation : '--rgw_port 443s'
reference: https://github.com/civetweb/civetweb/blob/master/docs/OpenSSL.md

Fixes: http://tracker.ceph.com/issues/21151

Signed-off-by: Mark Kogan <mkogan@redhat.com>
2017-09-28 18:02:49 +03:00
Sage Weil
dbc002eaa9 common/AsyncReserver: support preemption
If an (optional) preemption context is provided, use that to preempt
and existing reservation and grant a higher-priority one.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-27 15:40:18 -04:00
John Spray
15ad33f99b vstart: create MDSs before filesystems
This avoids spurious complaints about not
enough MDS daemons in the logs.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-18 17:30:54 -04:00
Kefu Chai
2f8356bf12 vstart.sh: simplify the objectstore related logic
also avoid overriding --memstore specified by command line with
the default "bluestore"

Reported-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-15 12:49:20 +08:00
Sage Weil
2496470df3 Merge pull request #17543 from iliul/fix-dup-global-section
vstart.sh: Remove duplicate global section

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-13 09:38:19 -05:00
iliul
549c910715 vstart.sh: Remove duplicate global section
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-09-13 14:04:17 +00:00
Sage Weil
5b89608343 Merge pull request #16272 from liewegas/wip-balancer
mgr/balancer: mgr module to automatically balance PGs across OSDs

Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-08 11:29:14 -05:00
Sage Weil
d5e5c68c37 pybind/mgr/balancer: rough framework
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 16:46:40 -04:00
xie xingguo
948f4bc325 src/vstart.sh: default os to filestore for FreeBSD
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-04 21:09:12 +08:00
Xie Xingguo
659f8912e6 Merge pull request #17100 from mychoxin/yuanxin_vstart_default_bluestore
vstart.sh: use bluestore as default osd objectstore backend

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-04 09:17:07 +08:00
Sage Weil
ededa106be Merge pull request #17057 from mikulely/enhance-vstart
vstart.sh: quote cmd params when display executing cmd

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 17:13:21 -05:00
Jiaying Ren
f545630888 vstart.sh: quote cmd params when display executing cmd
vstart.sh will echo executed cmd to the stdout:

/root/jiaying/ceph/build/bin/radosgw -c /root/jiaying/ceph/build/ceph.conf --log-file=/root/jiaying/ceph/build/out/rgw.j.log --debug-ms=1 -n client.rgw --rgw_frontends=civetweb port=8000

As params contain whitespaces, pasting the above cmd into the shell didn't start rgw
on the port 8000. Now the vstart.sh output is like the following:

'/root/jiaying/ceph/build/bin/radosgw' '-c' '/root/jiaying/ceph/build/ceph.conf' '--log-file=/root/jiaying/ceph/build/out/rgw.j.log' '--debug-ms=1' '-n' 'client.rgw' '--rgw_frontends=civetweb port=8000'

We can paste above cmd to the shell to restart rgw, it's more convenient for debugging.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-08-29 15:08:43 +08:00
Kefu Chai
30b5b4627c Merge pull request #16494 from asomers/bin_bash
misc: Fix bash path in shebangs

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 10:14:14 +08:00
mychoxin
657ff0386a vstart.sh: use bluestore as default osd objectstore backend
Signed-off-by: mychoxin <mychoxin@gmail.com>
2017-08-23 13:35:56 +08:00
Alan Somers
3aae5ca6fd scripts: fix bash path in shebangs
/bin/bash is a Linuxism.  Other operating systems install bash to
different paths.  Use /usr/bin/env in shebangs to find bash.

Signed-off-by: Alan Somers <asomers@gmail.com>
2017-07-27 13:24:26 -06:00
Sage Weil
c1aef68f02 Merge pull request #16569 from liewegas/wip-set-not-put
mon: 'config-key put' -> 'config-key set'

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-07-27 11:34:37 -05:00
Sage Weil
77ba569ac9 vstart.sh: start mgr after mon, before osds
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 17:22:25 -04:00
Sage Weil
4eb1a518e3 mon: 'config-key put' -> 'config-key set'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 14:10:08 -04:00
Sage Weil
0495efe624 vstart.sh: fix mgr vs restful command startup race
If the mgr hasn't activated yet we won't have registered the python
commands.  Use 'ceph tell mgr ...' to ensure we block.  (This is only a
problem right after mkfs when the first mgr hasn't started yet.)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-25 09:20:29 -04:00
Kefu Chai
8c1a2b1d94 vstart.sh: do not try to remove default asok_dir
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-24 16:40:10 +08:00
Kefu Chai
10b88b5d82 test: create asok files in a temp directory under $TMPDIR
to shorten the pathname of unix domain socket created for admin socket,
so it does not exceed the limit of 107 on GNU/Linux:

* ceph-helper.sh: the temp directory is named ${TMPDIR:-/tmp}/ceph-asok.$$
* vstart.sh: the temp directory is named `mktemp -u -d "${TMPDIR:-/tmp}/ceph-asok.XXXXXX"`

Fixes: http://tracker.ceph.com/issues/16895
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-22 01:05:29 +08:00
John Spray
b28c300258 qa/doc: update for "mgr tell" no longer needed
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-19 08:58:40 -04:00
Sage Weil
fd9582f085 Merge pull request #15432 from dachary/wip-osd-new
ceph-disk: support osd new

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-18 13:12:51 -05:00
Sage Weil
a88194093c vstart.sh: bind restful, dashboard to ::, not 127.0.0.1
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-14 14:34:06 -04:00
Loic Dachary
dcfe0573a9 vstart: it's OK to have very little free space
Signed-off-by: Loic Dachary <loic@dachary.org>
2017-07-14 19:47:00 +02:00
Casey Bodley
dfa1389615 vstart: add --rgw_compression to set rgw compression plugin
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-07-11 15:33:56 -04:00
Adam Kupczyk
88f00bcc7f Fixed too big privileges for client.rgw.
Signed-off-by: Adam Kupczyk <akucpzyk@redhat.com>
2017-07-11 13:12:33 -04:00
Adam Kupczyk
1967350dc8 vstart: allow to start multiple radosgw on consecutive ports
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2017-07-11 03:33:03 -04:00
John Spray
44bce9e02c Merge pull request #15858 from liewegas/wip-mgr-servicemap
mgr,librados: service map

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-10 15:03:07 +01:00
Sage Weil
563e040895 vstart.sh: give rgw daemons letter names
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-08 22:30:27 -04:00
Sage Weil
dc7a2aaf7a erasure-code: ruleset-* -> crush-*
1) ruleset is an obsolete term, and
2) crush-{rule,failure-domain,...} is more descriptive.

Note that we are changing the names of the erasure code profile keys
from ruleset-* to crush-*.  We will update this on upgrade when the
luminous flag is set, but that means that during mon upgrade you cannot
create EC pools that use these fields.

When the upgrade completes (users sets require_osd_release = luminous)
existing ec profiles are updated automatically.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-06 15:01:03 -04:00
Sage Weil
16fcee1f71 mon,mgr: manage mgr module list in mgrmap
Kill old mgr_modules option.

Add new mgr_initial_modules option, on the mon, for the initial cluster
mgrmap.

Add ls, enable, disable commands.

Respawn mgr if the module list changes.  In the future we could enable
new modules without a full restart, but disabling probably requires (and
is best handled by) a respawn.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-29 23:10:51 -04:00
John Spray
80e1a3c128 pybind/mgr: rename fsstatus->status
Still not exactly the best name but
reflects that it isn't just the fs bit.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-27 06:53:33 -04:00
Sage Weil
969113d7bf Merge pull request #15856 from cbodley/wip-rgw-vstart-s3tests
vstart: remove rgw_enable_static_website
2017-06-26 22:47:58 -05:00
Sage Weil
eb61a97511 Merge pull request #15848 from xiexingguo/wip-fix-rmcc
src/vstart.sh: kill dead upmap option
2017-06-23 09:42:57 -05:00
Willem Jan Withagen
3ae960d6be ./src/vstart.sh: Work around mgr restfull not available
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-06-23 11:33:18 +02:00