ceph/doc/changelog/v0.94.2.txt

   1 commit 5fb85614ca8f354284c713a2f9c610860720bbf3 (tag: refs/tags/v0.94.2, refs/remotes/gh/hammer)
   2 Author: Jenkins <jenkins@inktank.com>
   3 Date:   Tue Jun 9 12:32:34 2015 -0700
   4
   5     0.94.2
   6
   7 commit d967cecf0a5d7fbf992a0195341cbd893a358264
   8 Merge: eb69cf7 968573b
   9 Author: Loic Dachary <loic@dachary.org>
  10 Date:   Fri May 29 09:49:43 2015 +0200
  11
  12     Merge pull request #4795 from dachary/wip-11806-hammer
  13
  14     ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg
  15
  16     Reviewed-by: Sage Weil <sage@redhat.com>
  17
  18 commit 968573b8930a7c8485bf53e3a989ce2f7d0a2fff
  19 Author: Loic Dachary <ldachary@redhat.com>
  20 Date:   Thu May 28 10:35:51 2015 +0200
  21
  22     debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg
  23
  24     When ceph-objectstore-tool was moved from ceph-test to
  25     ceph by 61cf5da0b51e2d9578c7b4bca85184317e30f4ca, the ceph package in
  26     debian/control was updated accordingly, as recommended by
  27     https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces
  28
  29     The same must be done for the ceph-dbg package because
  30     /usr/lib/debug/usr/bin/ceph-objectstore-too is no longer in
  31     ceph-test-dbg.
  32
  33     Although the change was merged may 6th, 2015
  34     8f23382064c189b657564d58c3f9d17720e891ed, teuthology jobs were not
  35     always failing because packages were not systematically upgraded during
  36     the installation. The missing dependencies that were responsible for
  37     this upgrade problem were fixed by
  38     f898ec1e4e3472b0202280f09653a769fc62c8d3 on may 18th, 2015 and all
  39     upgrade tests relying on ceph-*-dbg packages started to fail
  40     systematically after this date.
  41
  42     http://tracker.ceph.com/issues/11546 Fixes: #11546
  43
  44     Signed-off-by: Loic Dachary <ldachary@redhat.com>
  45     (cherry picked from commit 6f11fbf41fab10924b1e0e41fcf27864779d4073)
  46
  47 commit eb69cf758eb25e7ac71e36c754b9b959edb67cee
  48 Merge: 63832d4 344328d
  49 Author: Ken Dreyer <kdreyer@redhat.com>
  50 Date:   Tue May 26 19:52:59 2015 -0600
  51
  52     Merge pull request #4773 from dachary/wip-11733-hammer
  53
  54     Debian: ceph-test and rest-bench debug packages should require their respective binary packages
  55
  56     Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
  57
  58 commit 344328de584ac707b59ab857f1f3dd4165adfcf5
  59 Author: Ken Dreyer <kdreyer@redhat.com>
  60 Date:   Mon May 18 10:50:58 2015 -0600
  61
  62     debian: set rest-bench-dbg ceph-test-dbg dependencies
  63
  64     Debian's debug packages ought to depend on their respective binary
  65     packages. This was the case for many of our ceph packages, but it was
  66     not the case for ceph-test-dbg or rest-bench-dbg.
  67
  68     Add the dependencies on the relevant binary packages, pinned to
  69     "= ${binary:Version}" per convention.
  70
  71     http://tracker.ceph.com/issues/11673 Fixes: #11673
  72
  73     Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
  74     (cherry picked from commit f898ec1e4e3472b0202280f09653a769fc62c8d3)
  75
  76 commit 63832d4039889b6b704b88b86eaba4aadcfceb2e
  77 Merge: 195884e 293affe
  78 Author: Loic Dachary <loic@dachary.org>
  79 Date:   Mon May 18 14:26:16 2015 +0200
  80
  81     Merge pull request #4696 from ceph/wip-11622-hammer
  82
  83     Wip 11622 hammer
  84
  85     Reviewed-by: Loic Dachary <ldachary@redhat.com>
  86
  87 commit 195884e21760f4948f7d1df8b65788514f918054
  88 Merge: b69fb89 95818da
  89 Author: Sage Weil <sage@redhat.com>
  90 Date:   Fri May 15 13:47:04 2015 -0700
  91
  92     Merge pull request #4649 from ceph/wip-hammer-package-perf-objectstore
  93
  94     packaging: include ceph_perf_objectstore
  95
  96 commit 293affe992118ed6e04f685030b2d83a794ca624 (refs/remotes/gh/wip-11622-hammer)
  97 Author: Yehuda Sadeh <yehuda@redhat.com>
  98 Date:   Wed May 13 17:05:22 2015 -0700
  99
 100     rgw: merge manifests correctly when there's prefix override
 101
 102     Fixes: #11622
 103     Backport: hammer, firefly
 104
 105     Prefix override happens in a manifest when a rados object does not
 106     conform to the generic prefix set on the manifest. When merging
 107     manifests (specifically being used in multipart objects upload), we need
 108     to check if the rule that we try to merge has a prefix that is the same
 109     as the previous rule. Beforehand we checked if both had the same
 110     override_prefix setting, but that might not apply as both manifests
 111     might have different prefixes.
 112
 113     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 114     (cherry picked from commit 389ae6739ddc6239a4dd7c5f7f9bfc9b645b8577)
 115
 116 commit a43d24861089a02f3b42061e482e05016a0021f6
 117 Author: Yehuda Sadeh <yehuda@redhat.com>
 118 Date:   Tue May 12 16:40:10 2015 -0700
 119
 120     rgw: restore buffer of multipart upload after EEXIST
 121
 122     Fixes #11604
 123     Backport: hammer, firefly
 124
 125     When we need to restart a write of part data, we need to revert to
 126     buffer to before the write, otherwise we're going to skip some data.
 127
 128     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 129     (cherry picked from commit 580ccaec12daae64c38a1616d0be907bdd70a888)
 130
 131 commit 95818dac1522c218662ec12bd42c470d8394b3b9
 132 Author: Ken Dreyer <kdreyer@redhat.com>
 133 Date:   Fri Mar 13 16:08:35 2015 -0600
 134
 135     packaging: include ceph_perf_objectstore
 136
 137     The /usr/bin/ceph_perf_objectstore file is installed by default. Prior
 138     to this commit it was missing from the packaging. This caused the RPM to
 139     fail to build in mock.
 140
 141     Add ceph_perf_objectstore to the "ceph-test" RPM and Debian package.
 142
 143     If we end up developing further ceph_perf_* utilities, it would make
 144     sense to glob them all with a wildcard, similar to what we are doing
 145     with all the ceph_test_* utilities in ceph-test.
 146
 147     Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
 148     (cherry picked from commit 338b44bc74bc4597939c5c58f2a6f2cb08de7d9c)
 149
 150 commit b69fb89122d6f989152a29124cc7ed54b5e4d43b
 151 Merge: 0f02512 efbfe6f
 152 Author: Yehuda Sadeh <yehuda@redhat.com>
 153 Date:   Mon May 11 10:27:02 2015 -0700
 154
 155     Merge pull request #4568 from dachary/wip-10662-10663-hammer
 156
 157     RGW swift API: Response header of COPY request for object does not
 158
 159     contain x-copied-from, custom metadata, x-copied-from-last-modified, X-Copied-From-Account headers
 160
 161     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 162
 163 commit 0f025122fe574b99504a630e3d489c3449cbbe46
 164 Merge: 7df3eb5 6e2dd40
 165 Author: Loic Dachary <loic@dachary.org>
 166 Date:   Mon May 11 14:08:53 2015 +0200
 167
 168     Merge pull request #4629 from ceph/hammer-uclient-checking
 169
 170     Hammer uclient checking
 171
 172     Reviewed-by: Loic Dachary <ldachary@redhat.com>
 173
 174 commit 6e2dd408be95644ee5bceb556a90483f882fe51c
 175 Author: John Spray <john.spray@redhat.com>
 176 Date:   Thu May 7 18:42:01 2015 +0100
 177
 178     client: fix error handling in check_pool_perm
 179
 180     Previously, on an error such as a pool not existing,
 181     the caller doing the check would error out, but
 182     anyone waiting on waiting_for_pool_perm would
 183     block indefinitely (symptom was that reads on a
 184     file with a bogus layout would block forever).
 185
 186     Fix by triggering the wait list on errors and
 187     clear the CHECKING state so that the other callers
 188     also perform the check and find the error.
 189
 190     Additionally, don't return the RADOS error code
 191     up to filesystem users, because it can be
 192     misleading.  For example, nonexistent pool is
 193     ENOENT, but we shouldn't give ENOENT on IO
 194     to a file which does exist, we should give EIO.
 195
 196     Signed-off-by: John Spray <john.spray@redhat.com>
 197     (cherry picked from commit e08cf25cafef5752877439c18cc584b0a75eca08)
 198     Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 199
 200 commit 3c2e6ae97d6129cb8f5befb3e7bf4be16373f6a5
 201 Author: John Spray <john.spray@redhat.com>
 202 Date:   Thu May 7 18:17:37 2015 +0100
 203
 204     client: use SaferCond in check_pool_perm
 205
 206     Just because it's easier to read.
 207
 208     Signed-off-by: John Spray <john.spray@redhat.com>
 209     (cherry picked from commit 289ee3b80ccce6bab2966f513a37332280d04a06)
 210     Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 211
 212 commit 79b2ac215187402a99594424944db4169f2b2cdf
 213 Author: Yan, Zheng <zyan@redhat.com>
 214 Date:   Fri Apr 24 15:23:21 2015 +0800
 215
 216     client: check OSD caps before read/write
 217
 218     Signed-off-by: Yan, Zheng <zyan@redhat.com>
 219     (cherry picked from commit 3c4028ec21e3ef9e8801c4570420c88722651cc7)
 220     Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 221
 222 commit 7df3eb5e548f7b95ec53d3b9d0e43a863d6fe682
 223 Merge: 6a7fa83 2f86995
 224 Author: Yehuda Sadeh <yehuda@redhat.com>
 225 Date:   Fri May 8 11:07:07 2015 -0700
 226
 227     Merge pull request #4567 from dachary/wip-10938-hammer
 228
 229     RGW Swift API: response for GET/HEAD on container does not contain the X-Timestamp header
 230
 231     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 232
 233 commit 6a7fa83b3e72b85f92d003a5bbb03a301354a657
 234 Merge: 553f0db 3edb196
 235 Author: Yehuda Sadeh <yehuda@redhat.com>
 236 Date:   Fri May 8 11:05:59 2015 -0700
 237
 238     Merge pull request #4570 from dachary/wip-10243-hammer
 239
 240     civetweb is hitting a limit (number of threads 1024)
 241
 242 commit 553f0db9a1fcff2601a8791af1d2bb6975d2821d
 243 Merge: 3fe1f2b 3aef0f2
 244 Author: Yehuda Sadeh <yehuda@redhat.com>
 245 Date:   Fri May 8 11:05:41 2015 -0700
 246
 247     Merge pull request #4573 from dachary/wip-11125-hammer
 248
 249     rgw: keystone token cache does not work correctly
 250
 251 commit 3fe1f2b8ab3d0d3943a312e90f6a3de99c36beb4
 252 Merge: e0ed459 4d1f3f0
 253 Author: Yehuda Sadeh <yehuda@redhat.com>
 254 Date:   Fri May 8 11:05:22 2015 -0700
 255
 256     Merge pull request #4574 from dachary/wip-11160-hammer
 257
 258     rgw: shouldn't need to disable rgw_socket_path if frontend is configured
 259
 260 commit e0ed459442b1e9053e29e345cd0f30d1b4b4b994
 261 Merge: d6de3fa d2043a5
 262 Author: Yehuda Sadeh <yehuda@redhat.com>
 263 Date:   Fri May 8 11:04:36 2015 -0700
 264
 265     Merge pull request #4575 from dachary/wip-10650-hammer
 266
 267     Response header of swift API PUT /container/object returned by RGW
 268
 269     does not contain last-modified, content-length, x-trans-id headers. But Swift returns these headers.
 270
 271     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 272
 273 commit d6de3fa0b55918bc2ac2d65ee8308f04d3605dfd
 274 Merge: 96dc624 2cb5d60
 275 Author: Yehuda Sadeh <yehuda@redhat.com>
 276 Date:   Fri May 8 11:03:37 2015 -0700
 277
 278     Merge pull request #4576 from dachary/wip-10661-hammer
 279
 280     RGW swift API: Response header of POST request for object does not contain content-length and x-trans-id headers
 281
 282     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 283
 284 commit 96dc624ee1f593f817055d3426054ef2e05cbf92
 285 Merge: ae61aee f4a0dab
 286 Author: Yehuda Sadeh <yehuda@redhat.com>
 287 Date:   Fri May 8 10:59:15 2015 -0700
 288
 289     Merge pull request #4579 from dachary/wip-11036-hammer
 290
 291     RGW Swift API: response for PUT on /container does not contain the mandatory Content-Length header when FCGI is used
 292
 293     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 294
 295 commit ae61aee99bee9185af22424ec8019e0308828bf5
 296 Merge: 593d07f 7f2a9ed
 297 Author: Yehuda Sadeh <yehuda@redhat.com>
 298 Date:   Fri May 8 10:57:47 2015 -0700
 299
 300     Merge pull request #4580 from dachary/wip-11088-hammer
 301
 302     RGW Swift API: wrong handling of empty metadata on Swift container
 303
 304     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 305
 306 commit 593d07f29df8584629936051be4458b00f8a8f1f
 307 Merge: 4f2b41c d164d80
 308 Author: Yehuda Sadeh <yehuda@redhat.com>
 309 Date:   Fri May 8 10:57:12 2015 -0700
 310
 311     Merge pull request #4581 from dachary/wip-11323-hammer
 312
 313     rgw: quota not respected in POST object
 314
 315     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 316
 317 commit 4f2b41c4c803786c49cd2d2806d82e9223ab96a9
 318 Merge: 92e7a7f 893ffd3
 319 Author: Josh Durgin <jdurgin@redhat.com>
 320 Date:   Fri May 8 09:15:41 2015 -0700
 321
 322     Merge pull request #4566 from dachary/wip-11478-hammer
 323
 324     Queued AIO reference counters not properly updated
 325
 326     Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 327
 328 commit 92e7a7f057dd9aabb4f66965c412135d05f6812f
 329 Merge: 2fbf171 0944051
 330 Author: Josh Durgin <jdurgin@redhat.com>
 331 Date:   Fri May 8 09:15:19 2015 -0700
 332
 333     Merge pull request #4564 from dachary/wip-11369-hammer
 334
 335     Periodic failure of TestLibRBD.DiffIterateStress
 336
 337     Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 338
 339 commit 2fbf1712d1e190774ada0af5094134369effb3ac
 340 Merge: 9d97946 02a3813
 341 Author: Loic Dachary <loic@dachary.org>
 342 Date:   Fri May 8 17:32:35 2015 +0200
 343
 344     Merge pull request #4585 from ceph/wip-11370-hammer
 345
 346     A retransmit of proxied flatten request can result in -EINVAL
 347
 348     Reviewed-by: Loic Dachary <ldachary@redhat.com>
 349
 350 commit 9d97946a8908e48849355a410415e09914ef3948
 351 Merge: fb10594 c548d8d
 352 Author: Kefu Chai <tchaikov@gmail.com>
 353 Date:   Fri May 8 20:39:29 2015 +0800
 354
 355     Merge pull request #4618 from dachary/wip-11398-kill-daemons-hammer
 356
 357     tests: ceph-helpers kill_daemons fails when kill fails
 358
 359     Reviewed-by: Kefu Chai <kchai@redhat.com>
 360
 361 commit c548d8d44baae78b868391e3c6fb7294f024b082
 362 Author: Loic Dachary <ldachary@redhat.com>
 363 Date:   Wed May 6 20:14:37 2015 +0200
 364
 365     tests: ceph-helpers kill_daemons fails when kill fails
 366
 367     Instead of silently leaving the daemons running, it returns failure so
 368     the caller can decide what to do with this situation. The timeout is
 369     also extended to minutes instead of seconds to gracefully handle the
 370     rare situations when a machine is extra slow for some reason.
 371
 372     http://tracker.ceph.com/issues/11398 Fixes: #11398
 373
 374     Signed-off-by: Loic Dachary <ldachary@redhat.com>
 375     (cherry picked from commit 0e26e9f72bc14417266b87ac1159607e1b109303)
 376
 377 commit fb10594f2ab2427a2bf1d2f2b164a3a0928e3335
 378 Author: Yuri Weinstein <yuri.weinstein@inktank.com>
 379 Date:   Thu May 7 17:12:35 2015 -0700
 380
 381     Added a "ceph hello world" for a simple check for ceph-deploy qa suite
 382
 383     Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
 384     (cherry picked from commit 13abae186357f4e9bb40990a7a212f93ec2e1e79)
 385
 386     Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
 387
 388 commit 6cfae7f074462498e82cfeeddbc2fe8d302c7aa0
 389 Merge: 736cdf4 8d9f4d4
 390 Author: Sage Weil <sage@redhat.com>
 391 Date:   Thu May 7 13:29:57 2015 -0700
 392
 393     Merge pull request #4502 from dachary/wip-11026-hammer
 394
 395     objecter: can get stuck in redirect loop if osdmap epoch == last_force_op_resend
 396
 397     Reviewed-by: Sage Weil <sage@redhat.com>
 398
 399 commit 736cdf450caa0b22cbfc54f4497717cf63d5bda7
 400 Merge: 3bd8e4f 46a4e8a
 401 Author: Loic Dachary <loic@dachary.org>
 402 Date:   Thu May 7 21:45:53 2015 +0200
 403
 404     Merge pull request #4562 from dachary/wip-11376-hammer
 405
 406     ceph-objectstore-tool should be in the ceph server package
 407
 408
 409
 410     Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 411
 412 commit 46a4e8af5be54d8348a920c4a3a58e24dbf35988
 413 Author: Ken Dreyer <kdreyer@redhat.com>
 414 Date:   Thu Apr 30 15:53:22 2015 -0600
 415
 416     packaging: mv ceph-objectstore-tool to main ceph pkg
 417
 418     This change ensures that the ceph-objectstore-tool utility is present on
 419     all OSDs.  This makes it easier for users to run this tool to do manual
 420     debugging/recovery in some scenarios.
 421
 422     http://tracker.ceph.com/issues/11376 Refs: #11376
 423
 424     Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
 425     (cherry picked from commit 61cf5da0b51e2d9578c7b4bca85184317e30f4ca)
 426         Conflicts:
 427                 debian/control
 428                 because file layout changes from ceph-test and ceph << 0.94.1-46
 429
 430 commit 3bd8e4fa17d8acfd645b8a553bf58de48d59d648
 431 Merge: 76f6db2 6a04b55
 432 Author: Loic Dachary <loic@dachary.org>
 433 Date:   Thu May 7 19:05:48 2015 +0200
 434
 435     Merge pull request #4561 from dachary/wip-11143-hammer
 436
 437     src/ceph-disk : disk zap sgdisk invocation
 438
 439     Reviewed-by: Loic Dachary <ldachary@redhat.com>
 440
 441 commit 76f6db24e09a4bfc55cbfb7075104f20653263cc
 442 Merge: e5a20f8 8996907
 443 Author: Loic Dachary <loic@dachary.org>
 444 Date:   Thu May 7 19:03:53 2015 +0200
 445
 446     Merge pull request #4560 from dachary/wip-11507-hammer
 447
 448     object creation by write cannot use an offset on an erasure coded pool
 449
 450     Reviewed-by: Samuel Just <sjust@redhat.com>
 451
 452 commit e5a20f83ed6d8d3d09827343d757318026f6a690
 453 Merge: e7671a5 8a6e6e4
 454 Author: Loic Dachary <loic@dachary.org>
 455 Date:   Thu May 7 19:03:16 2015 +0200
 456
 457     Merge pull request #4559 from dachary/wip-11429-hammer
 458
 459     OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap
 460
 461     Reviewed-by: Samuel Just <sjust@redhat.com>
 462
 463 commit e7671a58939f6e2e37f9f6df0f039f485ad4ca16
 464 Merge: 126a372 113f3b1
 465 Author: Loic Dachary <loic@dachary.org>
 466 Date:   Thu May 7 18:48:56 2015 +0200
 467
 468     Merge pull request #4563 from tchaikov/wip-hammer-11534
 469
 470     mon: Total size of OSDs is a maginitude less than it is supposed to be.
 471
 472     Reviewed-by: Loic Dachary <ldachary@redhat.com>
 473
 474 commit 126a37212550a4a59beaa80e0579098198f74db5
 475 Merge: 58b30d5 c87aa11
 476 Author: Loic Dachary <loic@dachary.org>
 477 Date:   Thu May 7 18:18:17 2015 +0200
 478
 479     Merge pull request #4577 from dachary/wip-10666-hammer
 480
 481     RGW swift API: Response header of GET request for container does not contain X-Container-Object-Count, X-Container-Bytes-Used and x-trans-id headers
 482
 483     Reviewed-by: Dmytro Iurchenko <diurchenko@mirantis.com>
 484     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 485
 486 commit f4a0dabfe8debc7b54afa5da179d51db891f5bc0
 487 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 488 Date:   Sun Mar 8 22:45:34 2015 +0100
 489
 490     rgw: send Content-Length in response for HEAD on Swift account.
 491
 492     Backport: hammer
 493     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 494     (cherry picked from commit 29073d84640b61d0221b2d2ab73c271d60fd13ba)
 495
 496 commit 32f4a7439d1e0ce6aab1c1e39407b14e124d03bf
 497 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 498 Date:   Fri Mar 6 13:18:19 2015 +0100
 499
 500     rgw: send Content-Length in response for DELETE on Swift container.
 501
 502     Backport: hammer
 503     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 504     (cherry picked from commit d260a93405a7a34a899f716bd9c4e731baa9ffd0)
 505
 506 commit d39a66007fa7211c00a67f9cd898e55551f5ae62
 507 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 508 Date:   Fri Mar 6 13:14:26 2015 +0100
 509
 510     rgw: send Content-Length in response for PUT on Swift container.
 511
 512     Fixes: #11036
 513     Backport: hammer
 514     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 515     (cherry picked from commit 10c1f1aa1e09df5edf5d2f9f9b0273ddbcb384fa)
 516
 517 commit 02a3813a6a4f9c8ce14f64fc7f378030e7ea6f93
 518 Author: Jason Dillaman <dillaman@redhat.com>
 519 Date:   Mon Apr 27 01:03:52 2015 -0400
 520
 521     librbd: flatten should return -EROFS if image is read-only
 522
 523     Fixes: #11475
 524     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 525     (cherry picked from commit f141e02ab719df830648318f4c1d9ca286071ed3)
 526
 527 commit af8939be80310e234745fe81e67244ab52c6add5
 528 Author: Jason Dillaman <dillaman@redhat.com>
 529 Date:   Mon Apr 27 01:00:38 2015 -0400
 530
 531     librbd: allow snapshots to be created when snapshot is active
 532
 533     The librbd API previously permitted the creation of snapshots while
 534     the image context was associated to another snapshot.  A recent code
 535     cleanup broke that ability, so this re-introduces it.  The code change
 536     also allows minor cleanup with rebuild_object_map.
 537
 538     Fixes: #11475
 539     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 540     (cherry picked from commit 594a6610802f2cadb62200815bd8b9860809e759)
 541
 542     Conflicts:
 543         src/librbd/internal.cc
 544
 545 commit d21c0c00d2bed282677d2063a3fb6f5346641286
 546 Author: Jason Dillaman <dillaman@redhat.com>
 547 Date:   Tue Apr 21 12:59:33 2015 -0400
 548
 549     librbd: better handling for duplicate flatten requests
 550
 551     A proxied flatten request could be replayed, resulting in a
 552     -EINVAL error code being generated on the second attempt. Filter
 553     out that error if it is known the parent did exist before the
 554     op started.
 555
 556     Fixes: #11370
 557     Backport: hammer
 558     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 559     (cherry picked from commit ef7e210c3f747bc4c3c8768c7b6407cc91c5c319)
 560
 561 commit ec0bd1dea526e04333d8059421666dcd2a59044e
 562 Author: Jason Dillaman <dillaman@redhat.com>
 563 Date:   Wed Mar 18 11:51:47 2015 -0400
 564
 565     librbd: use generic helper for issuing async requests
 566
 567     resize, flatten, and rebuild object map now use the same
 568     bootstrap code for sending the request to the remote lock owner
 569     or executing the request locally.
 570
 571     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 572     (cherry picked from commit 18fd6ca7f59d5545f0bb0b0e899d0739639ce104)
 573
 574     Conflicts:
 575         src/librbd/internal.cc
 576
 577 commit 8a6e6e4c107b03563b2e38aa24cc2067ce6a7350
 578 Author: Samuel Just <sjust@redhat.com>
 579 Date:   Mon Apr 20 23:45:57 2015 -0700
 580
 581     OSD: handle the case where we resurrected an old, deleted pg
 582
 583     Prior to giant, we would skip pgs in load_pgs which were not present in
 584     the current osdmap.  Those pgs would eventually refer to very old
 585     osdmaps, which we no longer have causing the assertion failure in 11429
 586     once the osd is finally upgraded to a version which does not skip the
 587     pgs.  Instead, if we do not have the map for the pg epoch, complain to
 588     the osd log and skip the pg.
 589
 590     Fixes: 11429
 591     Signed-off-by: Samuel Just <sjust@redhat.com>
 592     (cherry picked from commit fbfd50de5b9b40d71d2e768418a8eca28b1afaca)
 593
 594 commit efbfe6fced72d07309ccf1f1a219c037b7f535fa
 595 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 596 Date:   Sat Mar 21 15:53:08 2015 +0100
 597
 598     rgw: improve metadata handling on copy operation of Swift API.
 599
 600     Fixes: #10645
 601     Backport: hammer
 602     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 603     (cherry picked from commit a00cb31cc52e91bfacdd15e0af60be74e66c1996)
 604
 605 commit d164d8004feddb3e2238b26e3360a905e209d117
 606 Author: 9seconds <nineseconds@yandex.ru>
 607 Date:   Wed Apr 1 09:12:06 2015 +0300
 608
 609     rgw: quota not respected in POST object
 610
 611     Signed-off-by: Sergey Arkhipov <nineseconds@yandex.ru>
 612     Backport: hammer, firefly
 613     Fixes: #11323
 614     (cherry picked from commit e76f84e179d2ba8bfc0dc5abf4e620fef14bc8a0)
 615
 616     Conflicts:
 617         src/rgw/rgw_op.cc
 618             discard the whitespace modification hunk that were creating
 619         conflict and ignore the conflict due to an unrelated cast
 620             modification in the context
 621
 622 commit 7f2a9ed7a986145d4b34517a1a1bb44799ebf621
 623 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 624 Date:   Tue Mar 10 19:36:59 2015 +0100
 625
 626     rgw: fix handling empty metadata items on Swift container.
 627
 628     Fixes: #11088
 629     Backport: hammer
 630     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 631     (cherry picked from commit 1660d8625212f7b5fb30568ed640f467297e36cb)
 632
 633 commit 8e6efdbcb0f820b2ab3728662efbfb4bc45495af
 634 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 635 Date:   Fri Feb 27 15:23:16 2015 +0100
 636
 637     rgw: send Content-Length in response for GET on Swift container.
 638
 639     Fixes: #10971
 640     Backport: hammer
 641     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 642     (cherry picked from commit 5a64fb5430b6b42174bf53a5910d9435043c1380)
 643
 644 commit 54b62904a4cc3913be23803734fa68741a3c33cc
 645 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 646 Date:   Fri Mar 6 12:42:52 2015 +0100
 647
 648     rgw: enable end_header() to handle proposal of Content-Length.
 649
 650     Backport: hammer
 651     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 652     (cherry picked from commit f98fd4dfda7a105d621f99c2b48eb9ab9b45d979)
 653
 654 commit c87aa110bd224ae3220c5486fbd2486ebdfb8b8e
 655 Author: Dmytro Iurchenko <diurchenko@mirantis.com>
 656 Date:   Mon Feb 16 18:47:59 2015 +0200
 657
 658     rgw: Swift API. Complement the response to "show container details"
 659
 660     OpenStack Object Storage API v1 states that X-Container-Object-Count, X-Container-Bytes-Used and user-defined metadata headers should be included in a response.
 661
 662     Fixes: #10666
 663     Backport: hammer
 664     Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
 665     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 666     Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
 667     (cherry picked from commit d3a3d5ae5859cd7f2eed307e8f942f9a9fd75f35)
 668
 669 commit 2cb5d600699085fe0e996b91cf85603be3da230e
 670 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 671 Date:   Thu Feb 26 19:21:03 2015 +0100
 672
 673     rgw: enforce Content-Length in response for POST on Swift cont/obj.
 674
 675     Fixes: #10661
 676     Backport: hammer
 677     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 678     (cherry picked from commit fd0c612cf867d2e99e74820130357e63305970fb)
 679
 680 commit d2043a5f3b8d7a3ce50c4e84aa88481c8912ae25
 681 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 682 Date:   Fri Mar 13 21:41:45 2015 +0100
 683
 684     rgw: send Last-Modified header in response for PUT on Swift object.
 685
 686     Fixes: #10650
 687     Backport: hammer
 688     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 689     (cherry picked from commit 9a22acc57684534a245f25848c23d1db21f16653)
 690
 691 commit 4d1f3f03ef8809693c8ea2bcbc4d24fd41ae1842
 692 Author: Yehuda Sadeh <yehuda@redhat.com>
 693 Date:   Wed Mar 18 20:49:13 2015 -0700
 694
 695     rgw: don't use rgw_socket_path if frontend is configured
 696
 697     Fixes: #11160
 698     Backport: hammer, firefly
 699
 700     Previously if we wanted to use the tcp fcgi socket, we needed to clear
 701     rgw_socket_path.
 702
 703     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 704     (cherry picked from commit 36d6eea3caa79fcb4e08bdd340ccda2474b9e5ea)
 705
 706 commit 3aef0f2bb6f88bb17c460a3cef0d3503550f716c
 707 Author: Yehuda Sadeh <yehuda@redhat.com>
 708 Date:   Tue Mar 3 11:03:35 2015 -0800
 709
 710     rgw: update keystone cache with token info
 711
 712     Fixes: #11125
 713     Backport: hammer, firefly
 714
 715     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 716     (cherry picked from commit 6616294aa140ceb83cc61c6ab6f9947636f5e67d)
 717
 718 commit 3edb1964fe9e8574aafcb758d170007f0e43a324
 719 Author: Yehuda Sadeh <yehuda@redhat.com>
 720 Date:   Tue Apr 21 11:08:45 2015 -0700
 721
 722     civetweb: update max num of threads
 723
 724     Fixes: #10243
 725     cherry-picked upstream fixed into submodule
 726
 727     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 728     (cherry picked from commit 7a432f7bdfbbc51518fb63d7f2ecab401e8a8d4f)
 729
 730 commit bc6eb8d5f0a66aec3fbda0b794d008a3157a8154
 731 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 732 Date:   Tue Apr 7 14:09:57 2015 +0200
 733
 734     rgw: improve code formatting ONLY.
 735
 736     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 737     (cherry picked from commit 214c8b32b1b04885005e929a7ed2d4354b3ea20b)
 738
 739 commit 7aa1ae60cea17e0bd140c0cf2313d82f2f64554f
 740 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 741 Date:   Tue Mar 17 14:07:34 2015 +0100
 742
 743     rgw: send X-Copied-From-Last-Modified header of Swift API.
 744
 745     Fixes: #10663
 746     Backport: hammer
 747     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 748     (cherry picked from commit e7724a1d8c0872362c19f578fe30ac2cf3dada90)
 749
 750 commit 150b9e2b85a72dc247da4ba1ab770e6af053acb7
 751 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 752 Date:   Tue Mar 17 14:06:37 2015 +0100
 753
 754     rgw: dump object metadata in response for COPY request of Swift API.
 755
 756     Fixes: #10663
 757     Backport: hammer
 758     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 759     (cherry picked from commit c52b75edeaeef19471b9aca772bf08055bf04031)
 760
 761 commit e749701be5368a22cad1630f8202e48f5d980409
 762 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 763 Date:   Fri Mar 13 17:59:01 2015 +0100
 764
 765     rgw: refactor dumping metadata of Swift objects.
 766
 767     Backport: hammer
 768     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 769     (cherry picked from commit ccf6eaac6f7068289c4a4ffd3f0481d497ba7c87)
 770
 771 commit b034511fa79996415640b4aca3e8747340f2a127
 772 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 773 Date:   Fri Mar 13 18:37:39 2015 +0100
 774
 775     rgw: add support for X-Copied-From{-Account} headers of Swift API.
 776
 777     Fixes: #10663
 778     Backport: hammer
 779     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 780     (cherry picked from commit 94f1375ccb9df02cdd8f6828153ae2e3a7ad36b1)
 781
 782 commit c9e6a0bf8c601c4fd9065c1f3a8ea445bd652a52
 783 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 784 Date:   Wed Mar 11 14:08:03 2015 +0100
 785
 786     rgw: send ETag, Last-Modified in response for copying Swift cobject.
 787
 788     Fixes: #11087
 789     Backport: hammer
 790     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 791     (cherry picked from commit 385fe4b4bbbd4a9aab92abf2a813090deeaa037e)
 792
 793 commit 7f41ff0a6577b0784c6719b9d705f32921b1c40e
 794 Author: Dmytro Iurchenko <diurchenko@mirantis.com>
 795 Date:   Fri Feb 20 18:31:03 2015 +0200
 796
 797     rgw: Swift API. Allows setting attributes with COPY object operation.
 798
 799     http://developer.openstack.org/api-ref-objectstorage-v1.html says: "With COPY, you can add additional metadata to the object."
 800
 801     Fixes: #10662
 802     Backport: hammer
 803     Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
 804     Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
 805     (cherry picked from commit 1b722bbcd691e0a4a39ea77cd28e309fd723ec88)
 806
 807 commit 2f869959ffe1adbcfef7d26ae2d022d23d982673
 808 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 809 Date:   Wed Feb 25 16:12:58 2015 +0100
 810
 811     rgw: improve format of X-Timestamp on Swift objects.
 812
 813     Backport: hammer
 814     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 815     (cherry picked from commit e54fef9542bc2b5db192308728a99df139a4b6cf)
 816
 817 commit 48b19810a9860f6fccbf8d9b8a2fadfb37f598dd
 818 Author: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 819 Date:   Wed Feb 25 14:11:40 2015 +0100
 820
 821     rgw: add support for X-Timestamp on Swift containers.
 822
 823     Fixes: #10938
 824     Backport: hammer
 825     Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 826     (cherry picked from commit b7e9bf6b98ee48d1977d907a9e5130c0ce073c54)
 827
 828 commit 893ffd3767678ab881c4bc44ecfe1801cb9f9704
 829 Author: Jason Dillaman <dillaman@redhat.com>
 830 Date:   Mon Apr 27 03:43:10 2015 -0400
 831
 832     tests: AioCompletion incorrectly freed
 833
 834     The AioCompletion should be released instead of directly
 835     deleted.
 836
 837     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 838     (cherry picked from commit 387a09eeeaf0b66b3a2ddc36388da27d5804a4c7)
 839
 840 commit 96b0db5decfad452964750cff92a63007433e519
 841 Author: Jason Dillaman <dillaman@redhat.com>
 842 Date:   Mon Apr 27 03:42:24 2015 -0400
 843
 844     librbd: update ref count when queueing AioCompletion
 845
 846     If the client releases the AioCompletion while librbd is waiting
 847     to acquire the exclusive lock, the memory associated with the
 848     completion will be freed too early.
 849
 850     Fixes: #11478
 851     Backport: hammer
 852     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 853     (cherry picked from commit fd7723a1e62e682ac5a5279231a9fd6f5682bf94)
 854
 855 commit 094405171bdead0ce09055d4acc6445274992a01
 856 Author: Jason Dillaman <dillaman@redhat.com>
 857 Date:   Fri Apr 10 12:37:05 2015 -0400
 858
 859     librbd: failure to update the object map should always return success
 860
 861     If an object map update fails, the object map will be flagged as
 862     invalid.  However, if a subsequent update failure occurs, the error
 863     code will propagate back to the caller.
 864
 865     Fixes: #11369
 866     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 867     (cherry picked from commit 99f5a7d595c653447b351898192410c9cb773770)
 868
 869 commit 7ee7dcfd609731d3c7f51b74c1d99fb3fa51c413
 870 Author: Jason Dillaman <dillaman@redhat.com>
 871 Date:   Fri Mar 6 15:40:48 2015 -0500
 872
 873     tests: librados_test_stub reads should deep-copy
 874
 875     If a client of librados_test_stub modified a bufferlist
 876     retrieved via a read call, the client will actually be
 877     changing the contents of the file.  Therefore, read calls
 878     should deep-copy the contents of the buffer::ptrs.
 879
 880     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 881     (cherry picked from commit 76fe8d73ff79da2d734f70680208a2c188b58671)
 882
 883 commit 113f3b14ec8631d57bbbc2931e242ac96cf9e6fc
 884 Author: Zhe Zhang <zzxuanyuan@gmail.com>
 885 Date:   Tue May 5 18:08:48 2015 -0500
 886
 887     mon: Total size of OSDs is a maginitude less than it is supposed to be.
 888
 889     When dumping statistics of OSDs such as running command "ceph osd df",
 890     the sum of OSDs' size is 2^10 times less than their real size.
 891
 892     Fixes: #11534
 893     Signed-off-by: Zhe Zhang <zzxuanyuan@gmail.com>
 894     (cherry picked from commit 73d16f69d6f58fe8be262b0fb8db28c94605ea7d)
 895
 896 commit 6a04b55df76faad9b1b0770fbe6038b3b8c7d645
 897 Author: Owen Synge <osynge@suse.com>
 898 Date:   Tue Mar 17 15:41:33 2015 +0100
 899
 900     Fix "disk zap" sgdisk invocation
 901
 902     Fixes #11143
 903
 904     If the metadata on the disk is truly invalid, sgdisk would fail to zero
 905     it in one go, because --mbrtogpt apparently tried to operate on the
 906     metadata it read before executing --zap-all.
 907
 908     Splitting this up into two separate invocations to first zap everything
 909     and then clear it properly fixes this issue.
 910
 911     Based on patch by Lars Marowsky-Bree <lmb@suse.com> in ceph-deploy.
 912     Created by Vincent Untz <vuntz@suse.com>
 913
 914     Signed-off-by: Owen Synge <osynge@suse.com>
 915     Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
 916     (cherry picked from commit fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b)
 917
 918 commit 8996907e0a777320b505e74754f48a1a82308166
 919 Author: Jianpeng Ma <jianpeng.ma@intel.com>
 920 Date:   Fri Mar 6 15:54:07 2015 +0800
 921
 922     osd: refuse to write a new erasure coded object with an offset > 0
 923
 924     Even if the offset is properly aligned.
 925
 926     http://tracker.ceph.com/issues/11507 Fixes: #11507
 927
 928     Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 929     Signed-off-by: Loic Dachary <ldachary@redhat.com>
 930     (cherry picked from commit a4f1256c214ee0e7ebb91ac4ea8655f5d9642dc8)
 931
 932 commit 58b30d5426998bf7eab4a773f1a04e5bcfbf9b93
 933 Merge: bc51476 3a58e30
 934 Author: Yan, Zheng <ukernel@gmail.com>
 935 Date:   Wed May 6 16:01:57 2015 +0800
 936
 937     Merge pull request #4481 from ceph/hammer-11482
 938
 939     mds: remove caps from revoking list when caps are voluntarily released
 940
 941 commit bc51476181429d7d95d2bba5f774d8b60c47fb1f
 942 Author: Yehuda Sadeh <yehuda@redhat.com>
 943 Date:   Mon Apr 13 16:33:17 2015 -0700
 944
 945     ceph_json: add decode / encoder for multimap
 946
 947     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 948     (cherry picked from commit 55594623e2a478c3c023336b924bfdef0017d97f)
 949
 950 commit 7c7e651a0ae8bbcebe136da74b7dbe3a3e9edcc8
 951 Author: Yehuda Sadeh <yehuda@redhat.com>
 952 Date:   Mon Mar 30 17:34:57 2015 -0700
 953
 954     cls_rgw: use multimap to keep pending operations in bucket index
 955
 956     Fixes: #11256
 957     Multiple concurrent requests might be sent using the same tag, need the
 958     entry map to be able to hold multiple entries.
 959
 960     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 961     (cherry picked from commit 4e6a66b55e73c01347fc3330faa5c1307d29e9d3)
 962
 963 commit cb7571375377295d0aff791a03b22da6eb26109d
 964 Author: Yehuda Sadeh <yehuda@redhat.com>
 965 Date:   Fri Mar 27 16:32:48 2015 -0700
 966
 967     rgw: generate new tag for object when setting object attrs
 968
 969     Fixes: #11256
 970     Backport: firefly, hammer
 971
 972     Beforehand we were reusing the object's tag, which is problematic as
 973     this tag is used for bucket index updates, and we might be clobbering a
 974     racing update (like object removal).
 975
 976     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 977     (cherry picked from commit edc0627a1dbeb66ea2f5f177f6ceca64559ff3d8)
 978
 979 commit 7387c43382e7f114c43db3cc26ca77d081749d8e
 980 Author: Noah Watkins <noahwatkins@gmail.com>
 981 Date:   Fri Mar 27 19:34:12 2015 -0700
 982
 983     java: libcephfs_jni.so is in /usr/lib64 on rhel
 984
 985     Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 986     (cherry picked from commit aed3434dc7c5161c72c7d5655faa3bc693fc9777)
 987
 988     Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 989
 990 commit 5cc0f20ba00080881aff460fab2110cb7eaba279
 991 Merge: f7bcb2d 0e6a032
 992 Author: Loic Dachary <loic@dachary.org>
 993 Date:   Mon May 4 23:58:37 2015 +0200
 994
 995     Merge pull request #4498 from dachary/wip-11342-hammer
 996
 997     librbd notification race condition on snap_create
 998
 999     Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1000     Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1001
1002 commit f7bcb2dc6043501d478c9d7664bf39f34d5ad6d8
1003 Merge: 4d95929 2864da8
1004 Author: Loic Dachary <loic@dachary.org>
1005 Date:   Mon May 4 23:58:18 2015 +0200
1006
1007     Merge pull request #4497 from dachary/wip-7385-hammer
1008
1009     Objectcacher setting max object counts too low
1010
1011     Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1012     Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1013
1014 commit 4d95929c3129028de2d48efdef71fba2b949edd9
1015 Merge: 16c2f4c c615972
1016 Author: Loic Dachary <loic@dachary.org>
1017 Date:   Mon May 4 23:57:48 2015 +0200
1018
1019     Merge pull request #4499 from dachary/wip-11363-hammer
1020
1021     ImageWatcher should cancel in-flight ops on watch error
1022
1023     Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1024     Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1025
1026 commit 16c2f4c9e0428bda5d784c6c82929f748ec6cb4a
1027 Merge: addb0ec 0cdc93f
1028 Author: Loic Dachary <loic@dachary.org>
1029 Date:   Mon May 4 23:57:17 2015 +0200
1030
1031     Merge pull request #4496 from dachary/wip-5488-hammer
1032
1033     librbd: deadlock in image refresh
1034
1035     Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1036     Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1037
1038 commit addb0ec950e3a3b1150f927f028d2260c1cd0615
1039 Merge: c0782ed 379ef71
1040 Author: Loic Dachary <loic@dachary.org>
1041 Date:   Mon May 4 16:31:24 2015 +0200
1042
1043     Merge pull request #4505 from dachary/wip-11322-hammer
1044
1045     rgw - improve performance for large object (multiple chunks) GET
1046
1047     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1048
1049 commit c0782ed9ab1e59f39d3a30496214971d4cc509d9
1050 Merge: e074695 2f34d2e
1051 Author: Loic Dachary <loic@dachary.org>
1052 Date:   Mon May 4 16:24:53 2015 +0200
1053
1054     Merge pull request #4501 from dachary/wip-11001-hammer
1055
1056     Improve rgw HEAD request by avoiding read the body of the first chunk
1057
1058     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1059
1060 commit e074695e003f891e9c52e19a1679809155364d32
1061 Merge: 7f9d78d c6edc16
1062 Author: Loic Dachary <loic@dachary.org>
1063 Date:   Mon May 4 16:23:28 2015 +0200
1064
1065     Merge pull request #4500 from dachary/wip-11047-hammer
1066
1067     rgw : make quota/gc thread configurable for starting
1068
1069     Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1070
1071 commit 7f9d78d4f12ff3feaee519dd319426650ca0ff88
1072 Merge: 11b1ccd 4789686
1073 Author: Loic Dachary <loic@dachary.org>
1074 Date:   Mon May 4 11:46:13 2015 +0200
1075
1076     Merge pull request #4504 from dachary/wip-10691-hammer
1077
1078     ceph-dencoder links to libtcmalloc, and shouldn't
1079
1080     Reviewed-by: Sage Weil <sage@redhat.com>
1081
1082 commit 11b1ccdb6502406456905d05624f0600ef9df893
1083 Merge: 7c050ec 8709e34
1084 Author: Loic Dachary <loic@dachary.org>
1085 Date:   Mon May 4 11:44:11 2015 +0200
1086
1087     Merge pull request #4503 from dachary/wip-10983-hammer
1088
1089     use a new disk as journal disk,ceph-disk prepare fail
1090
1091     Reviewed-by: Loic Dachary <ldachary@redhat.com>
1092
1093 commit 7c050ecab2ccc29b03bab2c4ad67c22e9736bb9c
1094 Merge: c5e0b61 da7f683
1095 Author: Loic Dachary <loic@dachary.org>
1096 Date:   Mon May 4 11:43:23 2015 +0200
1097
1098     Merge pull request #4507 from dachary/wip-11432-hammer
1099
1100     compilation error: No high-precision counter available (armhf, powerpc..)
1101
1102     Reviewed-by: Loic Dachary <ldachary@redhat.com>
1103
1104 commit c5e0b615d7c98ef700ebe8048ed038f1ff036ff4
1105 Merge: ee61a61 856b2fa
1106 Author: Sage Weil <sage@redhat.com>
1107 Date:   Thu Apr 30 17:10:29 2015 -0700
1108
1109     Merge pull request #4515 from ceph/hammer-next
1110
1111     rgw: critical fixes for hammer
1112
1113 commit ee61a61face479d9895a5cd08ebc8aa93c8bb6ce
1114 Merge: abc0741 0ee022b
1115 Author: Samuel Just <sam.just@inktank.com>
1116 Date:   Thu Apr 30 09:23:53 2015 -0700
1117
1118     Merge pull request #4462 from liewegas/wip-11211-hammer
1119
1120     osd/ReplicatedPG: don't check order in finish_proxy_read
1121
1122 commit 856b2fa1fc72916349e484bf3615860392b74100
1123 Author: Yehuda Sadeh <yehuda@redhat.com>
1124 Date:   Wed Apr 22 15:39:05 2015 -0700
1125
1126     rgw-admin: a tool to fix object locator issue
1127
1128     Objects that start with underscore need to have an object locator,
1129     this is due to an old behavior that we need to retain. Some objects
1130     might have been created without the locator. This tool creates a new
1131     rados object with the appropriate locator.
1132
1133     Syntax:
1134
1135     $ ./radosgw-admin bucket check --check-head-obj-locator \
1136                                    --bucket=<bucket> [--fix]
1137
1138     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1139     (cherry picked from commit be4355ad8ed622734172fdce77ca71fb2635b36c)
1140
1141 commit 512ae4cb3e182ce79aca7354c66d2f2a662555da
1142 Author: Yehuda Sadeh <yehuda@redhat.com>
1143 Date:   Tue Apr 21 17:31:41 2015 -0700
1144
1145     rgw: set a special object locator if object starts with underscore
1146
1147     Fixes: #11442
1148     Backport: hammer
1149
1150     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1151     (cherry picked from commit 3d4a1d20b86a5a00556df3d6a8dba096509274b7)
1152
1153 commit da4d2274b5d83a116e767f3063752624d1719c32
1154 Author: Yehuda Sadeh <yehuda@redhat.com>
1155 Date:   Thu Apr 23 15:33:03 2015 -0700
1156
1157     rgw: use correct oid when creating gc chains
1158
1159     Fixes: #11447
1160     Backport: hammer
1161
1162     When creating gc chain, use the appropriate oid, otherwise objects will
1163     leak.
1164
1165     Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
1166     (cherry picked from commit cc5d34678c6d4bdcd552e6334a383c4df9797f46)
1167
1168 commit 4e84f318de97e592e16493c67491ba0d7f8103a8
1169 Author: Orit Wasserman <owasserm@redhat.com>
1170 Date:   Thu Apr 23 17:36:47 2015 +0200
1171
1172     rgw: civetweb should use unique request id
1173
1174     max_req_id was moved to RGWRados and changed to atomic64_t.
1175
1176     The same request id resulted in gc giving the same idtag to all objects
1177     resulting in a leakage of rados objects. It only kept the last deleted object in
1178     it's queue, the previous objects were never freed.
1179
1180     Fixes: 10295
1181     Backport: Hammer, Firefly
1182
1183     Signed-off-by: Orit Wasserman <owasserm@redhat.com>
1184     (cherry picked from commit c26225980c2fd018e70033a453d635533fcdefec)
1185
1186 commit abc0741d57f30a39a18106bf03576e980ad89177
1187 Merge: 74c2dc1 3001fad
1188 Author: Gregory Farnum <greg@gregs42.com>
1189 Date:   Wed Apr 29 15:02:56 2015 -0700
1190
1191     Merge pull request #4506 from dachary/wip-11381-hammer
1192
1193     messenger: double clear of pipe in reaper
1194
1195     Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1196
1197 commit 478968670caecd67f7995a09b60f6208729e3de3
1198 Author: Boris Ranto <branto@redhat.com>
1199 Date:   Mon Apr 13 12:38:58 2015 +0200
1200
1201     Move ceph-dencoder build to client
1202
1203     The patch simply moves the ceph-dencoder build from server part of the
1204     Makefiles to client part of the Makefiles.
1205
1206     Refs: #10691
1207
1208     Signed-off-by: Boris Ranto <branto@redhat.com>
1209     (cherry picked from commit ef2164725f0b55ffa4b609d407eed5f3f3048b46)
1210
1211 commit 7eabb70b906e50901551ab96453f05fe662a8876
1212 Author: Boris Ranto <branto@redhat.com>
1213 Date:   Mon Apr 13 15:07:03 2015 +0200
1214
1215     Rework mds/Makefile.am to support a dencoder client build
1216
1217     The patch adds all the mds sources to DENCODER_SOURCES to allow a
1218     dencoder client build. The patch also splits the Makefile.am file to
1219     better accomodate the change.
1220
1221     Refs: #10691
1222
1223     Signed-off-by: Boris Ranto <branto@redhat.com>
1224     (cherry picked from commit c2b3a35fb3cbf28d46a5427f32fbaff142c85f2a)
1225
1226     Conflicts:
1227             src/mds/Makefile-server.am
1228         src/mds/Makefile.am
1229             because the mds/StrayManager.h file was added after hammer
1230
1231 commit da7f6835b15370ce0120a64f7ac3359f3ba4729b
1232 Author: James Page <james.page@ubuntu.com>
1233 Date:   Fri Mar 13 19:46:04 2015 +0000
1234
1235     Add support for PPC architecture, provide fallback
1236
1237     Add high precision cpu cycles support for powerpc and powerpc64.
1238
1239     Provide a fallback for other architectures and warn during
1240     compilation.
1241
1242     Signed-off-by: James Page <james.page@ubuntu.com>
1243     (cherry picked from commit b2781fb5638afae7438b983a912ede126a8c5b85)
1244
1245 commit 3001fad4b6d7e692f6070ef166ed4a3e4849760f
1246 Author: Haomai Wang <haomaiwang@gmail.com>
1247 Date:   Fri Apr 17 22:07:00 2015 +0800
1248
1249     Fix clear_pipe after reaping progress
1250
1251     In pipe.cc:1353 we stop this connection and we will let reader and write threads stop. If now reader and writer quit ASAP and we call queue_reap to trigger the reap progress. Now we haven't call "connection_state->clear_pipe(this)" in pipe.cc:1379, so we may assert failure  here.
1252
1253     Fixes: #11381
1254     Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
1255     (cherry picked from commit 0ea0e011a6a6c6d6b40f5d97328bbad0e4568dd7)
1256
1257 commit 379ef714f7149a748891dafd41db80c247d35975
1258 Author: Guang Yang <yguang@yahoo-inc.com>
1259 Date:   Fri Apr 3 12:27:04 2015 +0000
1260
1261     rgw : Issue AIO for next chunk first before flush the (cached) data.
1262
1263     When handling GET request for large object (with multiple chunks), currently it will first flush the
1264     cached data, and then issue AIO request for next chunk, this has the potential issue to make the retriving
1265     from OSD and sending to client serialized. This patch switch the two operations.
1266
1267     Fixes: 11322
1268     Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
1269     (cherry picked from commit 366e8a85c0e9f00eed364eaebbfb6b672852eae9)
1270
1271 commit b903ad28a68772fa0b7a88b4db2724f4d07565d5
1272 Author: Boris Ranto <branto@redhat.com>
1273 Date:   Mon Apr 13 12:33:00 2015 +0200
1274
1275     rgw/Makefile.am: Populate DENCODER_SOURCES properly
1276
1277     Dencoder is built if ENABLE_CLIENT is set. However, the rgw/Makefile.am
1278     populated DENCODER_SOURCES only if WITH_RADOSGW was set. The patch fixes
1279     this and populates DENCODER_SOURES if ENABLE_CLIENT is set.
1280
1281     Signed-off-by: Boris Ranto <branto@redhat.com>
1282     (cherry picked from commit 0b264331f57b64880ce05fe3bd752e8df226d00c)
1283
1284 commit f994483c0e3a60226c8fb6983380ef8400b0160e
1285 Author: Boris Ranto <branto@redhat.com>
1286 Date:   Mon Apr 13 12:32:30 2015 +0200
1287
1288     Dencoder should never be built with tcmalloc
1289
1290     The patch adds disabled perfglue stubs to DENCODER sources in order to
1291     avoid tcmalloc-enabled ceph-dencoder builds.
1292
1293     Refs: #10691
1294
1295     Signed-off-by: Boris Ranto <branto@redhat.com>
1296     (cherry picked from commit fb11c74d1dc3843f2f5b6dca9c76278c5ceeca1c)
1297
1298 commit 8709e34f931809f7129cdac1203ec4e774e3eb4c
1299 Author: Loic Dachary <ldachary@redhat.com>
1300 Date:   Sun Mar 8 15:15:35 2015 +0100
1301
1302     ceph-disk: more robust parted output parser
1303
1304     In some cases, depending on the implementation or the operating system,
1305
1306        parted --machine -- /dev/sdh print
1307
1308     may contain empty lines. The current parsing code is fragile and highly
1309     depends on output details. Replace it with code that basically does the
1310     same sanity checks (output not empty, existence of units, existence of
1311     the dev entry) but handles the entire output instead of checking line by
1312     line.
1313
1314     http://tracker.ceph.com/issues/10983 Fixes: #10983
1315
1316     Signed-off-by: Loic Dachary <ldachary@redhat.com>
1317     (cherry picked from commit f5acf6bb6a342b05897605703d7d9cb7c09714fd)
1318
1319 commit 8d9f4d4eb546e26eeb3911811bdeb166d06cb1d1
1320 Author: Jianpeng Ma <jianpeng.ma@intel.com>
1321 Date:   Fri Mar 6 11:26:31 2015 +0800
1322
1323     osdc: add epoch_t last_force_resend in Op/LingerOp.
1324
1325     Using this field record the pg_poo_t::last_force_op_resend to avoid op
1326     endless when osd reply with redirect.
1327
1328     Fixes: #11026
1329     Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
1330     Signed-off-by: Sage Weil <sage@redhat.com>
1331     (cherry picked from commit def4fc4ae51174ae92ac1fb606427f4f6f00743e)
1332
1333 commit 2f34d2e73bb4bded4779af15a337c75eb2d1497f
1334 Author: Guang Yang <yguang@yahoo-inc.com>
1335 Date:   Tue Mar 3 09:46:52 2015 +0000
1336
1337     rgw: do not pre-fetch data for HEAD requests
1338
1339     Backport: hammer
1340
1341     Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
1342     (cherry picked from commit e32da3e7c880eaf7cb84d1c078447b28e1d8052b)
1343
1344 commit c6edc16fee027f6cdefacba08f1edc436a7406c5
1345 Author: Guang Yang <yguang@yahoo-inc.com>
1346 Date:   Wed Feb 4 03:21:52 2015 +0000
1347
1348     rgw - make starting quota/gc threads configurable
1349
1350     Fixes: 11047
1351     Backport: hammer
1352
1353     Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
1354     (cherry picked from commit a88712aeb4e7cd4208b9a707aa3bd4d03340c3ff)
1355
1356 commit c6159724f065731c41b2d29a48d0f0a3dc82340b
1357 Author: Jason Dillaman <dillaman@redhat.com>
1358 Date:   Fri Mar 20 11:56:55 2015 -0400
1359
1360     librbd: ImageWatcher should cancel in-flight ops on watch error
1361
1362     Upon an watch error notification from librados, pending requests
1363     should be canceled and in-flight IO should be flushed prior to
1364     unlocking the image.
1365
1366     Fixes: #11363
1367     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1368     (cherry picked from commit fc2e511b2aed4d40eff5101a4c9e513b34e5e58e)
1369
1370 commit 0e6a032c9e6ddae20be82df7500a0758d2cd8e74
1371 Author: Jason Dillaman <dillaman@redhat.com>
1372 Date:   Tue Apr 7 15:39:13 2015 -0400
1373
1374     librbd: moved snap_create header update notification to initiator
1375
1376     When handling a proxied snap_create operation, the client which
1377     invoked the snap_create should send the header update notification
1378     to avoid a possible race condition where snap_create completes but
1379     the client doesn't see the new snapshot (since it didn't yet receive
1380     the notification).
1381
1382     Fixes: #11342
1383     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1384     (cherry picked from commit 6e20ed6834912ccd979d16e3f3b340c239e05288)
1385
1386 commit 2864da86ca689472341e8a80f7ad6fcc5eb8321a
1387 Author: Jason Dillaman <dillaman@redhat.com>
1388 Date:   Wed Apr 22 11:27:35 2015 -0400
1389
1390     librbd: updated cache max objects calculation
1391
1392     The previous calculation was based upon the image's object size.
1393     Since the cache stores smaller bufferheads, the object size is not
1394     a good indicator of cache usage and was resulting in objects being
1395     evicted from the cache too often.  Instead, base the max number of
1396     objects on the memory load required to store the extra metadata
1397     for the objects.
1398
1399     Fixes: #7385
1400     Backport: firefly, hammer
1401     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1402     (cherry picked from commit 0b378942c4f1b79cb65967f2d3466728ca1c8d5b)
1403
1404     Conflicts:
1405         src/librbd/ImageCtx.cc
1406             because hammer has cct->_conf->rbd_cache_size
1407             instead of cache_size
1408
1409 commit 0cdc93fbdcf68a31e6aada38b0cb9d66efdc512d
1410 Author: Jason Dillaman <dillaman@redhat.com>
1411 Date:   Mon Mar 16 11:04:22 2015 -0400
1412
1413     librbd: acquire cache_lock before refreshing parent
1414
1415     cache_lock needs to be acquired before snap_lock to avoid
1416     the potential for deadlock.
1417
1418     Fixes: #5488
1419     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1420     (cherry picked from commit 703ba377e3de4007920f2ed7d8a0780f68676fe2)
1421
1422     Conflicts:
1423         src/librbd/internal.cc
1424             resolved by moving int r; in the scope of the block
1425
1426 commit a1b4aeb8e8c3a8d5c8284dcee8e03f501a77928c
1427 Author: Jason Dillaman <dillaman@redhat.com>
1428 Date:   Fri Mar 13 18:08:47 2015 -0400
1429
1430     librados_test_stub: AIO operation callbacks should be via Finisher
1431
1432     librados will execute all AIO callbacks via a single finisher to
1433     prevent blocking the Objecter.  Reproduce this behavior to avoid
1434     deadlocks that only exist when using the test stub.
1435
1436     Signed-off-by: Jason Dillaman <dillaman@redhat.com>
1437     (cherry picked from commit b38c96f2c1747a6d864e7aaa2e9858139ce9d1fd)
1438
1439 commit 3a58e30dc6563197f0effeabbd2fbf804403ad34
1440 Author: Yan, Zheng <zyan@redhat.com>
1441 Date:   Tue Apr 28 15:45:32 2015 +0800
1442
1443     mds: remove caps from revoking list when caps are voluntarily released
1444
1445     Fixes: #11482
1446     Signed-off-by: Yan, Zheng <zyan@redhat.com>
1447     (cherry picked from commit 86788c4ea4155f0388b7ebaf475a3d3c37d39331)
1448
1449 commit 74c2dc1f3924fa05e2c40f4cceb2ab060493bdfb
1450 Merge: 8a58d83 f30fa4a
1451 Author: Sage Weil <sage@redhat.com>
1452 Date:   Fri Apr 24 16:13:56 2015 -0700
1453
1454     Merge pull request #4463 from ceph/wip-11453-hammer-rgw-init-as-root
1455
1456     rgw: init-radosgw: run RGW as root
1457
1458     Reviewed-by: Sage Weil <sage@redhat.com>
1459
1460 commit f30fa4a364602fb9412babf7319140eca4c64995
1461 Author: Ken Dreyer <kdreyer@redhat.com>
1462 Date:   Wed Apr 22 16:36:42 2015 -0600
1463
1464     init-radosgw: run RGW as root
1465
1466     The ceph-radosgw service fails to start if the httpd package is not
1467     installed. This is because the init.d file attempts to start the RGW
1468     process with the "apache" UID. If a user is running civetweb, there is
1469     no reason for the httpd or apache2 package to be present on the system.
1470
1471     Switch the init scripts to use "root" as is done on Ubuntu.
1472
1473     http://tracker.ceph.com/issues/11453 Refs: #11453
1474
1475     Reported-by: Vickey Singh <vickey.singh22693@gmail.com>
1476     Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
1477     (cherry picked from commit 47339c5ac352d305e68a58f3d744c3ce0fd3a2ac)
1478
1479 commit 0ee022b1ae832c70a80e9d2cdf32403039f3f125 (refs/remotes/me/wip-11211-hammer)
1480 Author: Zhiqiang Wang <zhiqiang.wang@intel.com>
1481 Date:   Tue Mar 24 16:00:16 2015 +0800
1482
1483     osd/ReplicatedPG: don't check order in finish_proxy_read
1484
1485     Read doesn't need to be ordered. So when proxy read comes back from base
1486     tier, it's not necessarily at the front of the in progress list.
1487
1488     Fixes: #11211
1489
1490     Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
1491     (cherry picked from commit 560a5839c0d1852b5816937b845b60390777636c)
1492
1493 commit 8a58d83b0d039d2c2be353fee9c57c4e6181b662
1494 Author: Haomai Wang <haomaiwang@gmail.com>
1495 Date:   Sun Mar 22 23:59:19 2015 +0800
1496
1497     Fix ceph_test_async_driver failed
1498
1499     This test will create 10000 sockets which will failed because of limited system fd. Actually we only need to create several hundreds sockets and it's enough to get the test's goal.
1500
1501     Fix bug #11198(cherry picked from commit cd11daa2d21b7b059df9877cad38432678bb6161)
1502
1503 commit 85a68f9a8237f7e74f44a1d1fbbd6cb4ac50f8e8
1504 Author: Orit Wasserman <owasserm@redhat.com>
1505 Date:   Fri Apr 3 13:43:31 2015 +0200
1506
1507     rgw: remove meta file after deleting bucket
1508     The meta file is deleted only if the bucket meta data is not synced
1509
1510     Signed-off-by: Orit Wasserman <owasserm@redhat.com>
1511
1512     Fixes: #11149
1513     Backport: hammer, firefly
1514     (cherry picked from commit dfdc7afb59cc8e32cf8bff55faa09076c853de06)
1515
1516 commit b01e68fae2f8235b7a813188b664d3ec7bd1fa09
1517 Merge: addc7e2 bd0ec49
1518 Author: Loic Dachary <loic@dachary.org>
1519 Date:   Tue Apr 14 20:58:40 2015 +0200
1520
1521     Merge pull request #4332 from dachary/wip-11217-hammer
1522
1523     tests: TestFlatIndex.cc races with TestLFNIndex.cc
1524
1525     Reviewed-by: Sage Weil <sage@redhat.com>
1526
1527 commit addc7e2c6a4973cbcb5f02635be01a446cb223f0
1528 Merge: e4bfad3 51f5763
1529 Author: Sage Weil <sage@redhat.com>
1530 Date:   Tue Apr 14 09:05:53 2015 -0700
1531
1532     Merge pull request #4357 from dachary/wip-release-notes-hammer
1533
1534     release-notes: backport Hammer release notes
1535
1536 commit 51f57632f6d463e5f702bdb4e12c1914ec76d2b5
1537 Author: Loic Dachary <ldachary@redhat.com>
1538 Date:   Tue Apr 14 11:30:43 2015 +0200
1539
1540     release-notes: backport Hammer release notes
1541
1542     Include the Hammer release notes in Hammer.
1543
1544     Cherry picking the Hammer release notes cannot be done cleanly, they are
1545     copy/pasted instead. This will allow cherry-picking the release notes
1546     for the next point releases. It should be undisturbed by the release
1547     notes for other point releases because they modify parts of the file
1548     that will not generate cherry-pick conflicts.
1549
1550     Signed-off-by: Loic Dachary <ldachary@redhat.com>
1551
1552 commit bd0ec494739308dc33e6b042ae3e1aafd53c634c
1553 Author: Xinze Chi <xmdxcxz@gmail.com>
1554 Date:   Tue Mar 24 18:42:04 2015 +0800
1555
1556     bug fix: test case for lfn index
1557
1558     tests: TestFlatIndex.cc races with TestLFNIndex.cc
1559     Both use the same PATH and when run in parallel they sometime conflict.
1560
1561     Fixes: #11217
1562     Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
1563     (cherry picked from commit 791c3879d62b848616972f9c6d921aac30ac4925)