diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-31 10:31:31 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-31 10:31:31 -0700 |
| commit | c7f2def8aa8a384ea6c303ad218ed0a39efe316d (patch) | |
| tree | 4590488a5a93013f6836976903edcd9860702070 | |
| parent | 46279327cb73672ade37d72a361b0ec2784591cc (diff) | |
| parent | e48d6cb4023fb3735e9c4288f5d5c7bac44eadde (diff) | |
| download | ceph-c7f2def8aa8a384ea6c303ad218ed0a39efe316d.tar.gz | |
Merge branch 'next'
| -rwxr-xr-x | src/ceph-post-file.in | 8 | ||||
| -rwxr-xr-x | src/ceph.in | 3 | ||||
| -rw-r--r-- | src/mds/mdstypes.h | 1 | ||||
| -rw-r--r-- | src/mon/MonClient.cc | 6 | ||||
| -rw-r--r-- | src/mon/MonitorDBStore.h | 3 | ||||
| -rw-r--r-- | src/rgw/rgw_auth_s3.cc | 6 |
6 files changed, 21 insertions, 6 deletions
diff --git a/src/ceph-post-file.in b/src/ceph-post-file.in index 27fea287fc6..ba366dbfd4a 100755 --- a/src/ceph-post-file.in +++ b/src/ceph-post-file.in @@ -97,10 +97,10 @@ nonce=`uuidgen` # stick the user info in the dir too dir="${id}_${user}_${nonce}" -t1=$(tempfile) || exit -t2=$(tempfile) || exit -t3=$(tempfile) || exit -t4=$(tempfile) || exit +t1=$(mktemp) || exit +t2=$(mktemp) || exit +t3=$(mktemp) || exit +t4=$(mktemp) || exit trap "rm -f -- '$t1' '$t2' '$t3' '$t4'" EXIT cat > $t1 <<EOF mkdir post/$dir diff --git a/src/ceph.in b/src/ceph.in index ac356d80e75..320e4bd413f 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -35,7 +35,6 @@ if MYDIR.endswith('src') and \ if 'LD_LIBRARY_PATH' in os.environ: if MYLIBPATH not in os.environ['LD_LIBRARY_PATH']: os.environ['LD_LIBRARY_PATH'] += ':' + MYLIBPATH - os.environ['PATH'] += ':' + MYDIR print >> sys.stderr, DEVMODEMSG os.execvp('python', ['python'] + sys.argv) else: @@ -43,6 +42,8 @@ if MYDIR.endswith('src') and \ print >> sys.stderr, DEVMODEMSG os.execvp('python', ['python'] + sys.argv) sys.path.insert(0, os.path.join(MYDIR, 'pybind')) + if MYDIR not in os.environ['PATH']: + os.environ['PATH'] += ':' + MYDIR import argparse import errno diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h index 5537407a75d..4fcf584fb8c 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mdstypes.h @@ -474,6 +474,7 @@ struct fnode_t { void decode(bufferlist::iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list<fnode_t*>& ls); + fnode_t() : version(0) {}; }; WRITE_CLASS_ENCODER(fnode_t) diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 299379ac249..38bead8f29f 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -328,6 +328,12 @@ void MonClient::shutdown() version_requests.erase(version_requests.begin()); } + while (!waiting_for_session.empty()) { + ldout(cct, 20) << __func__ << " discarding pending message " << *waiting_for_session.front() << dendl; + waiting_for_session.front()->put(); + waiting_for_session.pop_front(); + } + monc_lock.Unlock(); if (initialized) { diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h index 85f6c895145..eda5aaf1802 100644 --- a/src/mon/MonitorDBStore.h +++ b/src/mon/MonitorDBStore.h @@ -41,7 +41,8 @@ class MonitorDBStore string key, endkey; bufferlist bl; - Op() { } + Op() + : type(0) { } Op(int t, string p, string k) : type(t), prefix(p), key(k) { } Op(int t, const string& p, string k, bufferlist& b) diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc index f3f0c8322f0..2b0685118b1 100644 --- a/src/rgw/rgw_auth_s3.cc +++ b/src/rgw/rgw_auth_s3.cc @@ -15,6 +15,12 @@ static const char *signed_subresources[] = { "partNumber", "policy", "requestPayment", + "response-cache-control", + "response-content-disposition", + "response-content-encoding", + "response-content-language", + "response-content-type", + "response-expires", "torrent", "uploadId", "uploads", |