[Pkg-ceph-commits] [ceph] 08/09: Refresh patches
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Mon Dec 26 20:48:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to tag debian/0.80.11-1
in repository ceph.
commit 9a63ae1c95c92538e6dfed2b221ca2165f53a166
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Thu Jan 14 22:17:21 2016 +0100
Refresh patches
---
debian/patches/backfill-prio.patch | 6 +++---
debian/patches/bug-8624a.patch | 4 ++--
debian/patches/bug-8624b.patch | 4 ++--
debian/patches/bug-8821.patch | 28 +++++++---------------------
debian/patches/bug-9341.patch | 20 +++++---------------
debian/patches/client-sleep1.patch | 4 +---
debian/patches/client-sleep2.patch | 8 ++------
debian/patches/client-sleep3.patch | 4 +---
debian/patches/sleep-recover.patch | 4 +---
9 files changed, 24 insertions(+), 58 deletions(-)
diff --git a/debian/patches/backfill-prio.patch b/debian/patches/backfill-prio.patch
index 6e3ffb3..47183b8 100644
--- a/debian/patches/backfill-prio.patch
+++ b/debian/patches/backfill-prio.patch
@@ -60,7 +60,7 @@ Date: Tue Jun 24 02:09:49 2014
*
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
-@@ -391,6 +391,9 @@
+@@ -394,6 +394,9 @@
// Maximum number of backfills to or from a single osd
OPTION(osd_max_backfills, OPT_U64, 10)
@@ -98,7 +98,7 @@ Date: Tue Jun 24 02:09:49 2014
pg_temp_lock("OSDService::pg_temp_lock"),
map_cache_lock("OSDService::map_lock"),
map_cache(cct->_conf->osd_map_cache_size),
-@@ -7929,6 +7931,7 @@
+@@ -7966,6 +7968,7 @@
{
static const char* KEYS[] = {
"osd_max_backfills",
@@ -106,7 +106,7 @@ Date: Tue Jun 24 02:09:49 2014
"osd_op_complaint_time", "osd_op_log_threshold",
"osd_op_history_size", "osd_op_history_duration",
"osd_map_cache_size",
-@@ -7948,6 +7951,10 @@
+@@ -7985,6 +7988,10 @@
service.local_reserver.set_max(cct->_conf->osd_max_backfills);
service.remote_reserver.set_max(cct->_conf->osd_max_backfills);
}
diff --git a/debian/patches/bug-8624a.patch b/debian/patches/bug-8624a.patch
index 1295cf4..4c19707 100644
--- a/debian/patches/bug-8624a.patch
+++ b/debian/patches/bug-8624a.patch
@@ -13,7 +13,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
-@@ -1068,6 +1068,14 @@ bool MDSMonitor::prepare_command(MMonCom
+@@ -1077,6 +1077,14 @@
ss << "pool '" << poolname << "' does not exist";
}
}
@@ -28,7 +28,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
if (poolid >= 0) {
pending_mdsmap.add_data_pool(poolid);
ss << "added data pool " << poolid << " to mdsmap";
-@@ -1116,6 +1124,29 @@ bool MDSMonitor::prepare_command(MMonCom
+@@ -1125,6 +1133,29 @@
r = -EINVAL;
goto out;
}
diff --git a/debian/patches/bug-8624b.patch b/debian/patches/bug-8624b.patch
index 9fdb025..f227d03 100644
--- a/debian/patches/bug-8624b.patch
+++ b/debian/patches/bug-8624b.patch
@@ -11,7 +11,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
-@@ -1131,7 +1131,10 @@ bool MDSMonitor::prepare_command(MMonCom
+@@ -1140,7 +1140,10 @@
r = -ENOENT;
goto out;
} else if (p->is_erasure()) {
@@ -23,7 +23,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
r = -EINVAL;
goto out;
}
-@@ -1142,7 +1145,10 @@ bool MDSMonitor::prepare_command(MMonCom
+@@ -1151,7 +1154,10 @@
r = -ENOENT;
goto out;
} else if (p->is_erasure()) {
diff --git a/debian/patches/bug-8821.patch b/debian/patches/bug-8821.patch
index d2abce2..aeae691 100644
--- a/debian/patches/bug-8821.patch
+++ b/debian/patches/bug-8821.patch
@@ -30,8 +30,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
-@@ -749,10 +749,10 @@
- * affected by rbd_default_order.
+@@ -773,8 +773,8 @@
*/
OPTION(rbd_default_format, OPT_INT, 1)
OPTION(rbd_default_order, OPT_INT, 22)
@@ -42,11 +41,9 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
OPTION(rbd_default_features, OPT_INT, 3) // 1 for layering, 3 for layering+stripingv2. only applies to format 2 images
OPTION(nss_db_path, OPT_STR, "") // path to nss db
-
--- a/src/rbd.cc
+++ b/src/rbd.cc
-@@ -2344,9 +2344,10 @@
-
+@@ -2345,7 +2345,8 @@
const char *poolname = NULL;
uint64_t size = 0; // in bytes
int order = 0;
@@ -56,9 +53,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
int format = 1;
uint64_t features = RBD_FEATURE_LAYERING;
const char *imgname = NULL, *snapname = NULL, *destname = NULL,
- *dest_poolname = NULL, *dest_snapname = NULL, *path = NULL,
-@@ -2358,9 +2359,9 @@
- long long stripe_unit = 0, stripe_count = 0;
+@@ -2359,7 +2360,7 @@
long long bench_io_size = 4096, bench_io_threads = 16, bench_bytes = 1 << 30;
string bench_pattern = "seq";
@@ -67,9 +62,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
std::ostringstream err;
long long sizell = 0;
std::vector<const char*>::iterator i;
- for (i = args.begin(); i != args.end(); ) {
-@@ -2374,15 +2375,17 @@
- return 0;
+@@ -2375,13 +2376,15 @@
} else if (ceph_argparse_flag(args, i, "--new-format", (char*)NULL)) {
format = 2;
format_specified = true;
@@ -88,9 +81,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
} else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) {
poolname = strdup(val.c_str());
} else if (ceph_argparse_witharg(args, i, &val, "--dest-pool", (char*)NULL)) {
- dest_poolname = strdup(val.c_str());
-@@ -2415,9 +2418,8 @@
- } else if (ceph_argparse_withlonglong(args, i, &bench_io_size, &err, "--io-size", (char*)NULL)) {
+@@ -2416,7 +2419,6 @@
} else if (ceph_argparse_withlonglong(args, i, &bench_io_threads, &err, "--io-threads", (char*)NULL)) {
} else if (ceph_argparse_withlonglong(args, i, &bench_bytes, &err, "--io-total", (char*)NULL)) {
} else if (ceph_argparse_witharg(args, i, &bench_pattern, &err, "--io-pattern", (char*)NULL)) {
@@ -98,9 +89,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
} else if (ceph_argparse_witharg(args, i, &val, "--path", (char*)NULL)) {
path = strdup(val.c_str());
} else if (ceph_argparse_witharg(args, i, &val, "--dest", (char*)NULL)) {
- destname = strdup(val.c_str());
-@@ -2440,11 +2442,11 @@
- progress = false;
+@@ -2441,9 +2443,9 @@
} else if (ceph_argparse_flag(args, i , "--allow-shrink", (char *)NULL)) {
resize_allow_shrink = true;
} else if (ceph_argparse_witharg(args, i, &val, "--format", (char *) NULL)) {
@@ -113,9 +102,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
format = ret;
format_specified = true;
cerr << "rbd: using --format for specifying the rbd image format is"
- << " deprecated, use --image-format instead"
-@@ -2556,8 +2558,19 @@
- break;
+@@ -2557,6 +2559,17 @@
}
}
@@ -133,7 +120,6 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
if (format_specified && opt_cmd != OPT_IMPORT && opt_cmd != OPT_CREATE) {
cerr << "rbd: image format can only be set when "
<< "creating or importing an image" << std::endl;
- return EXIT_FAILURE;
--- /dev/null
+++ b/src/test/cli-integration/rbd/defaults.t
@@ -0,0 +1,214 @@
diff --git a/debian/patches/bug-9341.patch b/debian/patches/bug-9341.patch
index 1c35924..48fbdee 100644
--- a/debian/patches/bug-9341.patch
+++ b/debian/patches/bug-9341.patch
@@ -7,8 +7,7 @@ Description: dramatically (e.g seconds instead of hours) reduce rejoin (i.e. MDS
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -466,16 +466,21 @@
-
+@@ -475,14 +475,19 @@
// ===================
// metadata cache stuff
@@ -31,9 +30,7 @@ Description: dramatically (e.g seconds instead of hours) reduce rejoin (i.e. MDS
// trim!
Dentry *dn = static_cast<Dentry*>(lru.lru_expire());
- if (!dn)
-@@ -483,8 +488,24 @@
-
+@@ -492,6 +497,22 @@
trim_dentry(dn);
}
@@ -56,9 +53,7 @@ Description: dramatically (e.g seconds instead of hours) reduce rejoin (i.e. MDS
// hose root?
if (lru.lru_get_size() == 0 && root && root->get_num_ref() == 0 && inode_map.size() == 1) {
ldout(cct, 15) << "trim_cache trimmed root " << root << dendl;
- delete root;
-@@ -1977,10 +1998,15 @@
- int newstate = mdsmap->get_state(p->first);
+@@ -1986,8 +2007,13 @@
if (!mdsmap->is_up(p->first) ||
mdsmap->get_inst(p->first) != p->second->inst) {
messenger->mark_down(p->second->con);
@@ -73,9 +68,7 @@ Description: dramatically (e.g seconds instead of hours) reduce rejoin (i.e. MDS
} else if (oldstate == newstate)
continue; // no change
- if (newstate == MDSMap::STATE_RECONNECT &&
-@@ -2016,8 +2042,16 @@
- {
+@@ -2025,6 +2051,14 @@
int mds = session->mds_num;
ldout(cct, 10) << "send_reconnect to mds." << mds << dendl;
@@ -90,11 +83,9 @@ Description: dramatically (e.g seconds instead of hours) reduce rejoin (i.e. MDS
MClientReconnect *m = new MClientReconnect;
// i have an open session.
- ceph::unordered_set<inodeno_t> did_snaprealm;
--- a/src/client/Client.h
+++ b/src/client/Client.h
-@@ -392,9 +392,9 @@
- int fill_stat(Inode *in, struct stat *st, frag_info_t *dirstat=0, nest_info_t *rstat=0);
+@@ -399,7 +399,7 @@
void touch_dn(Dentry *dn);
// trim cache.
@@ -103,4 +94,3 @@ Description: dramatically (e.g seconds instead of hours) reduce rejoin (i.e. MDS
void trim_dentry(Dentry *dn);
void trim_caps(MetaSession *s, int max);
- void dump_inode(Formatter *f, Inode *in, set<Inode*>& did, bool disconnected);
diff --git a/debian/patches/client-sleep1.patch b/debian/patches/client-sleep1.patch
index f3b2367..d867ad9 100644
--- a/debian/patches/client-sleep1.patch
+++ b/debian/patches/client-sleep1.patch
@@ -11,8 +11,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -3108,14 +3108,29 @@
- while (!in->caps.empty())
+@@ -3123,12 +3123,27 @@
remove_cap(in->caps.begin()->second, true);
}
@@ -43,4 +42,3 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
}
void Client::trim_caps(MetaSession *s, int max)
- {
diff --git a/debian/patches/client-sleep2.patch b/debian/patches/client-sleep2.patch
index 67ce24a..8d8bc84 100644
--- a/debian/patches/client-sleep2.patch
+++ b/debian/patches/client-sleep2.patch
@@ -10,8 +10,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -2385,8 +2385,11 @@
-
+@@ -2400,6 +2400,9 @@
int Client::get_caps(Inode *in, int need, int want, int *phave, loff_t endoff)
{
while (1) {
@@ -21,9 +20,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
if (endoff > 0 &&
(endoff >= (loff_t)in->max_size ||
endoff > (loff_t)(in->size << 1)) &&
- endoff > (loff_t)in->wanted_max_size) {
-@@ -3116,11 +3119,15 @@
- while (s->caps.size()) {
+@@ -3131,9 +3134,13 @@
Cap *cap = *s->caps.begin();
Inode *in = cap->inode;
int dirty_caps = 0;
@@ -38,4 +35,3 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
if (dirty_caps) {
lderr(cct) << "remove_session_caps still has dirty|flushing caps on " << *in << dendl;
if (in->flushing_caps)
- num_flushing_caps--;
diff --git a/debian/patches/client-sleep3.patch b/debian/patches/client-sleep3.patch
index edf1a36..fef31af 100644
--- a/debian/patches/client-sleep3.patch
+++ b/debian/patches/client-sleep3.patch
@@ -10,8 +10,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -2123,17 +2123,23 @@
- void Client::kick_requests_closed(MetaSession *session)
+@@ -2136,15 +2136,21 @@
{
ldout(cct, 10) << "kick_requests_closed for mds." << session->mds_num << dendl;
for (map<ceph_tid_t, MetaRequest*>::iterator p = mds_requests.begin();
@@ -41,4 +40,3 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
}
}
assert(session->requests.empty());
- assert(session->unsafe_requests.empty());
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index bf89722..ee00779 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,8 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -9048,8 +9048,9 @@
-
+@@ -9413,6 +9413,7 @@
case MetaSession::STATE_OPEN:
ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
s->state = MetaSession::STATE_STALE;
@@ -15,4 +14,3 @@ Description: fix fuse-client hang after wake-up from suspend.
break;
case MetaSession::STATE_NEW:
- case MetaSession::STATE_CLOSED:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list