From: John Spray <jspray@redhat.com>
Date: Sat, 15 Apr 2017 18:45:54 +0000 (+0100)
Subject: Merge pull request #13587 from yanghonggang/master
X-Git-Tag: v12.0.2~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c65e4fbf8effb17af51b64868c9c3d39f4744efe;p=ceph.git

Merge pull request #13587 from yanghonggang/master

cephfs: fix write_buf's _len overflow problem

Reviewed-by: John Spray <john.spray@redhat.com>
---

c65e4fbf8effb17af51b64868c9c3d39f4744efe
diff --cc src/common/config_opts.h
index 9e6a1448ab3a,5e6f32b14f9c..ae6fdf2ccb38
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -489,8 -481,12 +489,10 @@@ OPTION(journaler_allow_split_entries, O
  OPTION(journaler_write_head_interval, OPT_INT, 15)
  OPTION(journaler_prefetch_periods, OPT_INT, 10)   // * journal object size
  OPTION(journaler_prezero_periods, OPT_INT, 5)     // * journal object size
 -OPTION(journaler_batch_interval, OPT_DOUBLE, .001)   // seconds.. max add latency we artificially incur
 -OPTION(journaler_batch_max, OPT_U64, 0)  // max bytes we'll delay flushing; disable, for now....
  OPTION(mds_data, OPT_STR, "/var/lib/ceph/mds/$cluster-$id")
  OPTION(mds_max_file_size, OPT_U64, 1ULL << 40) // Used when creating new CephFS. Change with 'ceph mds set max_file_size <size>' afterwards
+ // max xattr kv pairs size for each dir/file
+ OPTION(mds_max_xattr_pairs_size, OPT_U32, 64 << 10)
  OPTION(mds_cache_size, OPT_INT, 100000)
  OPTION(mds_cache_mid, OPT_FLOAT, .7)
  OPTION(mds_max_file_recover, OPT_U32, 32)
diff --cc src/osdc/Journaler.h
index 26a09a7aeda1,df2cadfcca8a..12708efdba10
--- a/src/osdc/Journaler.h
+++ b/src/osdc/Journaler.h
@@@ -386,9 -397,10 +396,10 @@@ public
      stream_format(-1), journal_stream(-1),
      magic(mag),
      objecter(obj), filer(objecter, f), logger(l), logger_key_lat(lkey),
 -    timer(tim), delay_flush_event(0),
 +    delay_flush_event(0),
      state(STATE_UNDEF), error(0),
      prezeroing_pos(0), prezero_pos(0), write_pos(0), flush_pos(0), safe_pos(0),
+     write_buf_throttle(cct, "write_buf_throttle", UINT_MAX - (UINT_MAX >> 3)),
      waiting_for_zero(false),
      read_pos(0), requested_pos(0), received_pos(0),
      fetch_len(0), temp_fetch_len(0),