diff options
| author | Kefu Chai <kchai@redhat.com> | 2017-07-20 13:20:04 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2017-07-21 19:05:29 +0200 |
| commit | 10b88b5d821b85fe4e61b130c241656fd79cf50c (patch) | |
| tree | b2d3a09486f05a791a2c2e7b8d16da2b7be2a3b7 /src/ceph.in | |
| parent | Merge pull request #16408 from yanghonggang/master (diff) | |
| download | ceph-10b88b5d821b85fe4e61b130c241656fd79cf50c.tar.xz ceph-10b88b5d821b85fe4e61b130c241656fd79cf50c.zip | |
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>
Diffstat (limited to 'src/ceph.in')
| -rwxr-xr-x | src/ceph.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ceph.in b/src/ceph.in index a51a619d298..4112ed178dd 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -781,7 +781,8 @@ def main(): i = sys.argv.index("injectargs") sys.argv = sys.argv[:i] + ceph_args.split() + sys.argv[i:] else: - sys.argv.extend(ceph_args.split()) + sys.argv.extend([arg for arg in ceph_args.split() + if '--admin-socket' not in arg]) parser, parsed_args, childargs = parse_cmdargs() if parsed_args.version: |