Merge version 14.2.6-1+rpi1 and 14.2.6-4 to produce 14.2.6-4+rpi1

Merge ceph (14.2.6-4) import into refs/heads/workingbranch

[PATCH] mgr/dashboard: fix improper URL checking

This change disables up-level references beyond the HTTP base directory.
[CVE-2020-1699]

Fixes: https://tracker.ceph.com/issues/43607
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Gbp-Pq: Name 0443e40c11280ba3b7efcba61522afa70c4f8158.patch

add-option-to-disable-ceph-dencoder

===================================================================

Gbp-Pq: Name add-option-to-disable-ceph-dencoder.patch

fix-bash-completion-location

Gbp-Pq: Name fix-bash-completion-location

debian-armel-armhf-buildflags

Gbp-Pq: Name debian-armel-armhf-buildflags.patch

Fix building with clang.

Forwarded: yes

 https://tracker.ceph.com/issues/43437

Gbp-Pq: Name fix-clang-build.patch

[PATCH] os/bluestore/BlueFS: use uint64_t for `len`

change the type of parameter `len` of `BlueFS::_read_random()` from
`size_t` to `uint64_t`.

i think the type of `size_t` comes from
`rocksdb::RandomAccessFile::Read(uint64_t offset, size_t n,
rocksdb::Slice* result, char* scratch)`. and when we implement this
method, we continued using `n`'s type. but, we are using it with
`std::min()`, for instance, where the template parameter type deduction
fails if the lhs and rhs parameters' types are different. so probaly the
better solution is to use `uint64_t` directly to avoid the the cast and
specializing the template.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Gbp-Pq: Name bluefs-use-uint64_t-for-len.patch

Adds max_connections to test display.

Origin: upstream, https://github.com/civetweb/civetweb/pull/776/commits/3b8eb36676f70d06f8918ccf62029207c49cdda0
Bug: https://github.com/civetweb/civetweb/issues/775
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109
Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable_test.patch

Makes SOMAXCONN user-configurable.

Origin: upstream, https://github.com/civetweb/civetweb/pull/776/commits/febab7dc38c9671577603425c54c20f841e27f97
Bug: https://github.com/civetweb/civetweb/issues/775
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109
Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable.patch

Adds max_connections to reference configuration.

Origin: upstream, https://github.com/civetweb/civetweb/pull/776/commits/3b8eb36676f70d06f8918ccf62029207c49cdda0
Bug: https://github.com/civetweb/civetweb/issues/775
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109
Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable_conf.patch

Avoid use of size_t when necessary

Forwarded: no

On 32 bit architectures size_t is not a 64 bit type, which
causes comparison mismatch failures during compilation.

Gbp-Pq: Name 32bit-avoid-size_t.patch

Avoid overloading on 32 bit architectures

Forwarded: no

unsigned and size_t are equivalent on 32 bit architectures,
so only define the size_t based overload of advance on 64
bit architectures.
https://wiki.debian.org/ArchitectureSpecificsMemo

Gbp-Pq: Name 32bit-avoid-overloading.patch

disable-crypto

Gbp-Pq: Name disable-crypto.patch

use --release 7 instead of -source/-target

Bug-Ubuntu: https://launchpad.net/bugs/1756854
Bug-Ubuntu: https://launchpad.net/bugs/1766998
Forwarded: no
Last-Update: 2018-04-24

Instead of -source/-target ceph should be build with --release for OpenJDK 9
or later so that the bootclasspath is also set, as per JEP-247, otherwise it
risks incurring into binary incompatibility when run with an earlier OpenJDK.
OpenJDK 11 minimum compatibility release has been updated to 7.
Last-Update: 2018-04-24
Gbp-Pq: Name update-java-source-target-flags.patch

ceph (14.2.6-4) unstable; urgency=high

  * Really uploading to unstable now.

[dgit import unpatched ceph 14.2.6-4]

Import ceph_14.2.6-4.debian.tar.xz

[dgit import tarball ceph 14.2.6-4 ceph_14.2.6-4.debian.tar.xz]

Remove stray conflict marker from changelog.

Put back some files that are present in upstream tarball but seem to have
disappeared somewhere along the line.

Add mention of change that was introduced in previous upload, but not mentioned in changelog.

Merge tag '14.2.6-1' into bullseye-staging

Merge ceph (14.2.6-1) import into refs/heads/workingbranch

Import ceph_14.2.6.orig.tar.xz

[dgit import orig ceph_14.2.6.orig.tar.xz]

fix-bash-completion-location

Gbp-Pq: Name fix-bash-completion-location

debian-armel-armhf-buildflags

Gbp-Pq: Name debian-armel-armhf-buildflags.patch

Fix building with clang.

Forwarded: yes

 https://tracker.ceph.com/issues/43437

Gbp-Pq: Name fix-clang-build.patch

[PATCH] os/bluestore/BlueFS: use uint64_t for `len`

change the type of parameter `len` of `BlueFS::_read_random()` from
`size_t` to `uint64_t`.

i think the type of `size_t` comes from
`rocksdb::RandomAccessFile::Read(uint64_t offset, size_t n,
rocksdb::Slice* result, char* scratch)`. and when we implement this
method, we continued using `n`'s type. but, we are using it with
`std::min()`, for instance, where the template parameter type deduction
fails if the lhs and rhs parameters' types are different. so probaly the
better solution is to use `uint64_t` directly to avoid the the cast and
specializing the template.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Gbp-Pq: Name bluefs-use-uint64_t-for-len.patch

Adds max_connections to test display.

Origin: upstream, https://github.com/civetweb/civetweb/pull/776/commits/3b8eb36676f70d06f8918ccf62029207c49cdda0
Bug: https://github.com/civetweb/civetweb/issues/775
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109
Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable_test.patch

Makes SOMAXCONN user-configurable.

Origin: upstream, https://github.com/civetweb/civetweb/pull/776/commits/febab7dc38c9671577603425c54c20f841e27f97
Bug: https://github.com/civetweb/civetweb/issues/775
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109
Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable.patch

Adds max_connections to reference configuration.

Origin: upstream, https://github.com/civetweb/civetweb/pull/776/commits/3b8eb36676f70d06f8918ccf62029207c49cdda0
Bug: https://github.com/civetweb/civetweb/issues/775
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1838109
Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable_conf.patch

Avoid use of size_t when necessary

Forwarded: no

On 32 bit architectures size_t is not a 64 bit type, which
causes comparison mismatch failures during compilation.

Gbp-Pq: Name 32bit-avoid-size_t.patch

Avoid overloading on 32 bit architectures

Forwarded: no

unsigned and size_t are equivalent on 32 bit architectures,
so only define the size_t based overload of advance on 64
bit architectures.
https://wiki.debian.org/ArchitectureSpecificsMemo

Gbp-Pq: Name 32bit-avoid-overloading.patch

disable-crypto

Gbp-Pq: Name disable-crypto.patch

use --release 7 instead of -source/-target

Bug-Ubuntu: https://launchpad.net/bugs/1756854
Bug-Ubuntu: https://launchpad.net/bugs/1766998
Forwarded: no
Last-Update: 2018-04-24

Instead of -source/-target ceph should be build with --release for OpenJDK 9
or later so that the bootclasspath is also set, as per JEP-247, otherwise it
risks incurring into binary incompatibility when run with an earlier OpenJDK.
OpenJDK 11 minimum compatibility release has been updated to 7.
Last-Update: 2018-04-24
Gbp-Pq: Name update-java-source-target-flags.patch

ceph (14.2.6-1) unstable; urgency=medium

  [ James Page ]
  * [2e50d5b] Fix misnamed package Recommends brbd1 -> librbd1
  * [11df8ed] Add missing debhelper misc:Depends for python3-ceph
  * [08c3c8b] Add missing Depends on python3-{distutils,routes} to ceph-mgr-dashboard package

  [ Bernd Zeimetz ]
  * [a87f434] Update upstream source from tag 'upstream/14.2.6'
    Update to upstream version '14.2.6'
    with Debian dir f37aa9f99ec09cc88d8e5e468c1f642fa7f77ef1
  * [e91626b] Revert "Fix ceph-mgr - indefinite queue growth hangs"
    This reverts commit 010db9a30458a6417ff667c3c11a3870edb8ee0c.
    Patches were applied upstream for 14.2.6

[dgit import unpatched ceph 14.2.6-1]

Import ceph_14.2.6-1.debian.tar.xz

[dgit import tarball ceph 14.2.6-1 ceph_14.2.6-1.debian.tar.xz]

Fix target distribution in changelog.

Disable neon on armhf too.

put my name in changelog.

Commit Debian 3.0 (quilt) metadata

[dgit (9.9) quilt-fixup]

Restore lost dos line endings.

Fix raspbian patch to match upstream tree.

Merge slightly patched 14.2.5-3 into bullseye-staging

Remove problematic gitattributes files.

Merge ceph (14.2.5-3) import into refs/heads/workingbranch

mon/PGMap.h: disable network stats in dump_osd_stats

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit ffb8a2a904426c8a3d6fc2fd70266418a98623c5)

 Conflicts:
src/mon/PGMap.h - trivial resolution

Gbp-Pq: Name 32466.patch-2

osd_stat_t::dump: Add option for ceph-mgr pythonn callers to skip ping network

Due to the overhead of this on large clusters, we removed the network
information was wasn't getting used anyway.

Fixes: https://tracker.ceph.com/issues/43364
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1e2fe722c41d4cc34094afb157b3eb06b4a50972)

 Conflicts:
src/mon/PGMap.cc - trivial resolution
src/mon/PGMap.h - trivial resolution
src/osd/osd_types.h  - trivial resolution

Gbp-Pq: Name 32466.patch-1

fix-bash-completion-location

Gbp-Pq: Name fix-bash-completion-location

debian-armel-armhf-buildflags

Gbp-Pq: Name debian-armel-armhf-buildflags.patch

fix-clang-build

Gbp-Pq: Name fix-clang-build.patch

os/bluestore/BlueFS: use uint64_t for `len`

change the type of parameter `len` of `BlueFS::_read_random()` from
`size_t` to `uint64_t`.

i think the type of `size_t` comes from
`rocksdb::RandomAccessFile::Read(uint64_t offset, size_t n,
rocksdb::Slice* result, char* scratch)`. and when we implement this
method, we continued using `n`'s type. but, we are using it with
`std::min()`, for instance, where the template parameter type deduction
fails if the lhs and rhs parameters' types are different. so probaly the
better solution is to use `uint64_t` directly to avoid the the cast and
specializing the template.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Gbp-Pq: Name bluefs-use-uint64_t-for-len.patch

civetweb-755-1.8-somaxconn-configurable_test

Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable_test.patch

civetweb-755-1.8-somaxconn-configurable

Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable.patch

civetweb-755-1.8-somaxconn-configurable_conf

Gbp-Pq: Name civetweb-755-1.8-somaxconn-configurable_conf.patch

bit-avoid-size_t

Gbp-Pq: Name 32bit-avoid-size_t.patch

bit-avoid-overloading

Gbp-Pq: Name 32bit-avoid-overloading.patch

disable-crypto

Gbp-Pq: Name disable-crypto.patch

update-java-source-target-flags

Gbp-Pq: Name update-java-source-target-flags.patch

ceph (14.2.5-3) unstable; urgency=medium

  * Uploading to unstable

  * [010db9a] Fix ceph-mgr - indefinite queue growth hangs.
    Applying the backport for the fix
    https://github.com/ceph/ceph/pull/32466
    Thanks to Milan Kupcevic (Closes: #947969)
  * [b01de37] Merge branch 'debian/unstable' into debian/experimental
  * [c8f35e5] Add breaks/replaces for ceph-common - ceph mds.
  * [ee905cb] Revert "Configure gbp for experimental"
    This reverts commit 3bcd5ac5f416b902a868036c243d7f19752c82f8.
  * [6303513] Revert "CI: build in experimental"
    This reverts commit d481122833e611c69c28e2b381e1cc1c8f689385.
  * [f1a9482] Snapshot changelog
  * [6e955c8] Removing automatic Ubuntu header
  * [b90d95a] Mark patch as forwarded

[dgit import unpatched ceph 14.2.5-3]

Import ceph_14.2.5-3.debian.tar.xz

[dgit import tarball ceph 14.2.5-3 ceph_14.2.5-3.debian.tar.xz]

Import ceph_14.2.5.orig.tar.xz

[dgit import orig ceph_14.2.5.orig.tar.xz]

Merge version 12.2.11+dfsg1-2+rpi1 and 12.2.11+dfsg1-2.1 to produce 12.2.11+dfsg1-2.1+rpi1

Merge ceph (12.2.11+dfsg1-2.1) import into refs/heads/workingbranch

rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

The master commit 5c040d991510cb4ff0d74305889130e2d84fedc1 fixing issue
http://tracker.ceph.com/issues/23680 was backported to luminous for v12.2.11 by
a47e714e7f5ce803ba7d8986c5d954123b85fc8e which was included in
https://github.com/ceph/ceph/pull/24621, where it came as the first of a series
of five cherry-picks.

This, it turns out, was the wrong order - it should have come last since it
was a follow-up fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(partial manual backport of 5c040d991510cb4ff0d74305889130e2d84fedc1)

Gbp-Pq: Name radosgw-linkage-without-beast.patch

bit-ftbfs

Gbp-Pq: Name 32-bit-ftbfs.patch

softfp-armel

Gbp-Pq: Name softfp-armel.patch

boost-1.67-fixes

Gbp-Pq: Name boost-1.67-fixes.patch

librbd: Do not instantiate TrimRequest template class

We include TrimRequest.cc in librbd tests at two places:
 - operation/test_mock_TrimRequest.cc
 - operation/test_mock_ResizeRequest.cc

That causes linking errors when doing the builds because some of the
instantiated classes are defined twice.

We can fix this by not instantiating the template class in the
TrimReqeust.cc file when including it in the tests.

Signed-off-by: Boris Ranto <branto@redhat.com>
Gbp-Pq: Name armhf-ftbfs.patch

fix-var-run-perms-sysvinit

Gbp-Pq: Name fix-var-run-perms-sysvinit.patch

Core-local statistics

Summary:
This diff changes `StatisticsImpl` from a thread-local approach to a core-local one. The goal is to perform faster aggregations, particularly for applications that have many threads. There should be no behavior change.
Closes https://github.com/facebook/rocksdb/pull/2258

Differential Revision: D5016258

Pulled By: ajkr

fbshipit-source-id: 7d4d165b4a91d8110f0409d113d1be91f22d31a9
(cherry picked from commit ac39d6bec5b2c23a2c3fd0f0e61d468be4f3e803)

Gbp-Pq: Name 0003-Core-local-statistics.patch

core-local array type conversions

Summary:
try to clean up the type conversions and hope it passes on windows.

one interesting thing I learned is that bitshift operations are special: in `x << y`, the result type depends only on the type of `x`, unlike most arithmetic operations where the result type depends on both operands' types.
Closes https://github.com/facebook/rocksdb/pull/2277

Differential Revision: D5050145

Pulled By: ajkr

fbshipit-source-id: f3309e77526ac9612c632bf93a62d99757af9a29
(cherry picked from commit bbe9ee7dd4a542b191ace521ca13b4bdb063008b)

Gbp-Pq: Name 0002-core-local-array-type-conversions.patch

CoreLocalArray class

Summary:
Moved the logic for core-local array out of ConcurrentArena and into a separate class because I want to reuse it for core-local stats.
Closes https://github.com/facebook/rocksdb/pull/2256

Differential Revision: D5011518

Pulled By: ajkr

fbshipit-source-id: a75a7b8f7b7a42fd6273489ada405f14c6be196a
(cherry picked from commit cda5fde2d96624df38afc7f02b6b3e699648c62d)

Gbp-Pq: Name 0001-CoreLocalArray-class.patch

rocksdb-fallthrough-i386

Gbp-Pq: Name rocksdb-fallthrough-i386.patch

libatomic

Gbp-Pq: Name libatomic.patch

virtualenv-never-download

Gbp-Pq: Name virtualenv-never-download.patch

remove ceph.com ref to favicon

Origin: backport, https://github.com/ceph/ceph/commit/409b8923a24ff557c53260842aaff6400054bc9b

Gbp-Pq: Name 0013-remove-ceph.com-ref-to-favicon.patch

fix various spelling errors

Forwarded: https://github.com/ceph/ceph/pull/20831

Gbp-Pq: Name 0010-fix-various-spelling-errors.patch

ceph (12.2.11+dfsg1-2.1) unstable; urgency=medium

  * Non-maintainer upload.
  * [3194010] Install ceph-volume@.service into ceph-osd.
    (Closes: #924061)

[dgit import unpatched ceph 12.2.11+dfsg1-2.1]

Import ceph_12.2.11+dfsg1-2.1.debian.tar.xz

[dgit import tarball ceph 12.2.11+dfsg1-2.1 ceph_12.2.11+dfsg1-2.1.debian.tar.xz]

Merge version 12.2.10+dfsg1-1+rpi1 and 12.2.11+dfsg1-2 to produce 12.2.11+dfsg1-2+rpi1

Merge ceph (12.2.11+dfsg1-2) import into refs/heads/workingbranch

rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

The master commit 5c040d991510cb4ff0d74305889130e2d84fedc1 fixing issue
http://tracker.ceph.com/issues/23680 was backported to luminous for v12.2.11 by
a47e714e7f5ce803ba7d8986c5d954123b85fc8e which was included in
https://github.com/ceph/ceph/pull/24621, where it came as the first of a series
of five cherry-picks.

This, it turns out, was the wrong order - it should have come last since it
was a follow-up fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(partial manual backport of 5c040d991510cb4ff0d74305889130e2d84fedc1)

Gbp-Pq: Name radosgw-linkage-without-beast.patch

bit-ftbfs

Gbp-Pq: Name 32-bit-ftbfs.patch

softfp-armel

Gbp-Pq: Name softfp-armel.patch

boost-1.67-fixes

Gbp-Pq: Name boost-1.67-fixes.patch

librbd: Do not instantiate TrimRequest template class

We include TrimRequest.cc in librbd tests at two places:
 - operation/test_mock_TrimRequest.cc
 - operation/test_mock_ResizeRequest.cc

That causes linking errors when doing the builds because some of the
instantiated classes are defined twice.

We can fix this by not instantiating the template class in the
TrimReqeust.cc file when including it in the tests.

Signed-off-by: Boris Ranto <branto@redhat.com>
Gbp-Pq: Name armhf-ftbfs.patch

fix-var-run-perms-sysvinit

Gbp-Pq: Name fix-var-run-perms-sysvinit.patch

Core-local statistics

Summary:
This diff changes `StatisticsImpl` from a thread-local approach to a core-local one. The goal is to perform faster aggregations, particularly for applications that have many threads. There should be no behavior change.
Closes https://github.com/facebook/rocksdb/pull/2258

Differential Revision: D5016258

Pulled By: ajkr

fbshipit-source-id: 7d4d165b4a91d8110f0409d113d1be91f22d31a9
(cherry picked from commit ac39d6bec5b2c23a2c3fd0f0e61d468be4f3e803)

Gbp-Pq: Name 0003-Core-local-statistics.patch

core-local array type conversions

Summary:
try to clean up the type conversions and hope it passes on windows.

one interesting thing I learned is that bitshift operations are special: in `x << y`, the result type depends only on the type of `x`, unlike most arithmetic operations where the result type depends on both operands' types.
Closes https://github.com/facebook/rocksdb/pull/2277

Differential Revision: D5050145

Pulled By: ajkr

fbshipit-source-id: f3309e77526ac9612c632bf93a62d99757af9a29
(cherry picked from commit bbe9ee7dd4a542b191ace521ca13b4bdb063008b)

Gbp-Pq: Name 0002-core-local-array-type-conversions.patch

CoreLocalArray class

Summary:
Moved the logic for core-local array out of ConcurrentArena and into a separate class because I want to reuse it for core-local stats.
Closes https://github.com/facebook/rocksdb/pull/2256

Differential Revision: D5011518

Pulled By: ajkr

fbshipit-source-id: a75a7b8f7b7a42fd6273489ada405f14c6be196a
(cherry picked from commit cda5fde2d96624df38afc7f02b6b3e699648c62d)

Gbp-Pq: Name 0001-CoreLocalArray-class.patch

rocksdb-fallthrough-i386

Gbp-Pq: Name rocksdb-fallthrough-i386.patch

libatomic

Gbp-Pq: Name libatomic.patch

virtualenv-never-download

Gbp-Pq: Name virtualenv-never-download.patch

remove ceph.com ref to favicon

Origin: backport, https://github.com/ceph/ceph/commit/409b8923a24ff557c53260842aaff6400054bc9b

Gbp-Pq: Name 0013-remove-ceph.com-ref-to-favicon.patch

fix various spelling errors

Forwarded: https://github.com/ceph/ceph/pull/20831

Gbp-Pq: Name 0010-fix-various-spelling-errors.patch

ceph (12.2.11+dfsg1-2) unstable; urgency=medium

  * [27a321] Fix builds on 32bit architectures
  * [346bfa] Fix linking radosgw without BEAST frontend

[dgit import unpatched ceph 12.2.11+dfsg1-2]

Import ceph_12.2.11+dfsg1-2.debian.tar.xz

[dgit import tarball ceph 12.2.11+dfsg1-2 ceph_12.2.11+dfsg1-2.debian.tar.xz]

Import ceph_12.2.11+dfsg1.orig.tar.xz

[dgit import orig ceph_12.2.11+dfsg1.orig.tar.xz]

Update quilt patch.

Manual merge of version 10.2.5-7.2+rpi1 and 12.2.10+dfsg1-1 to produce 12.2.10+dfsg1-1+rpi1