diff mbox series

[meta-oe] mongodb: Upgrade to 4.4.24

Message ID 20230918045713.1751183-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] mongodb: Upgrade to 4.4.24 | expand

Commit Message

Khem Raj Sept. 18, 2023, 4:57 a.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../mongodb/mongodb/PTHREAD_STACK_MIN.patch   | 19 -------------------
 .../recipes-dbs/mongodb/mongodb_git.bb        |  7 +++----
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch

Comments

Martin Jansa Sept. 22, 2023, 11:46 a.m. UTC | #1 
I'll check what changed, but just FYI in some world builds I'm now seeing
mongodb failure:

src/mongo/util/net/http_client_curl.cpp: In function 'size_t
mongo::{anonymous}::ReadMemoryCallback(char*, size_t, size_t, void*)':
src/mongo/util/net/http_client_curl.cpp:172:21: error: no matching function
for call to 'min(size_t, long unsigned int)'
  172 |             std::min(size * nitems, static_cast<unsigned
long>(bufReader->remaining()));
      |
~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

looks like only 32bit builds are affected.

On Mon, Sep 18, 2023 at 6:57 AM Khem Raj <raj.khem@gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../mongodb/mongodb/PTHREAD_STACK_MIN.patch   | 19 -------------------
>  .../recipes-dbs/mongodb/mongodb_git.bb        |  7 +++----
>  2 files changed, 3 insertions(+), 23 deletions(-)
>  delete mode 100644
> meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
>
> diff --git
> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
> b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
> deleted file mode 100644
> index f08177d7b4..0000000000
> ---
> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -PTHREAD_STACK_MIN is no longer a compile time define in glibc 2.34+ and
> since
> -we only care for glibc and musl where PTHREAD_STACK_MIN is always defined
> there
> -is no need to check for constant called PTHREAD_STACK_MIN since its
> already defined
> -this fix may not work for wider audience but for OE needs its sufficient
> -
> -Upstream-Status: Inappropriate [OE-only fix]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---- a/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp
> -+++ b/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp
> -@@ -57,9 +57,7 @@ namespace boost
> - #else
> -           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
> - #endif
> --#if PTHREAD_STACK_MIN > 0
> -           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
> --#endif
> -           size = ((size+page_size-1)/page_size)*page_size;
> -           int res = pthread_attr_setstacksize(&val_, size);
> -           BOOST_VERIFY(!res && "pthread_attr_setstacksize failed");
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
> mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
> mongodb_git.bb
> index 21051a8958..f1a508f3f2 100644
> --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
> mongodb_git.bb
> +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
> mongodb_git.bb
> @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \
>
>  inherit scons dos2unix siteinfo python3native systemd useradd
>
> -PV = "4.4.19"
> -#v4.4.18
> -SRCREV = "9a996e0ad993148b9650dc402e6d3b1804ad3b8a"
> +PV = "4.4.24"
> +#v4.4.24
> +SRCREV = "0b86b9b7b42ad9970c5f818c527dd86c0634243a"
>  SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https
> \
>
> file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \
>             file://0001-Use-long-long-instead-of-int64_t.patch \
> @@ -29,7 +29,6 @@ SRC_URI = "git://
> github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
>             file://0001-include-needed-c-header.patch \
>             file://disable_runtime_check.patch \
>             file://ppc64_ARCH_BITS.patch \
> -           file://PTHREAD_STACK_MIN.patch \
>
> file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \
>
> file://0001-server-Adjust-the-cache-alignment-assumptions.patch \
>
> file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \
> --
> 2.42.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#104921):
> https://lists.openembedded.org/g/openembedded-devel/message/104921
> Mute This Topic: https://lists.openembedded.org/mt/101427962/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Martin Jansa Sept. 22, 2023, 1:27 p.m. UTC | #2 
It's caused by:
https://github.com/mongodb/mongo/commit/f872d0b4efeba4f45961fca175e9bb3c65675d5f
I've reported the issue in:
https://jira.mongodb.org/browse/SERVER-73007

lets see what upstream does, I guess they don't care about 32bit targets
anymore (or at least aren't testing them much).

On Fri, Sep 22, 2023 at 1:46 PM Martin Jansa via lists.openembedded.org
<martin.jansa=gmail.com@lists.openembedded.org> wrote:

> I'll check what changed, but just FYI in some world builds I'm now seeing
> mongodb failure:
>
> src/mongo/util/net/http_client_curl.cpp: In function 'size_t
> mongo::{anonymous}::ReadMemoryCallback(char*, size_t, size_t, void*)':
> src/mongo/util/net/http_client_curl.cpp:172:21: error: no matching
> function for call to 'min(size_t, long unsigned int)'
>   172 |             std::min(size * nitems, static_cast<unsigned
> long>(bufReader->remaining()));
>       |
> ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> looks like only 32bit builds are affected.
>
> On Mon, Sep 18, 2023 at 6:57 AM Khem Raj <raj.khem@gmail.com> wrote:
>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../mongodb/mongodb/PTHREAD_STACK_MIN.patch   | 19 -------------------
>>  .../recipes-dbs/mongodb/mongodb_git.bb        |  7 +++----
>>  2 files changed, 3 insertions(+), 23 deletions(-)
>>  delete mode 100644
>> meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
>>
>> diff --git
>> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
>> b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
>> deleted file mode 100644
>> index f08177d7b4..0000000000
>> ---
>> a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
>> +++ /dev/null
>> @@ -1,19 +0,0 @@
>> -PTHREAD_STACK_MIN is no longer a compile time define in glibc 2.34+ and
>> since
>> -we only care for glibc and musl where PTHREAD_STACK_MIN is always
>> defined there
>> -is no need to check for constant called PTHREAD_STACK_MIN since its
>> already defined
>> -this fix may not work for wider audience but for OE needs its sufficient
>> -
>> -Upstream-Status: Inappropriate [OE-only fix]
>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---- a/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp
>> -+++ b/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp
>> -@@ -57,9 +57,7 @@ namespace boost
>> - #else
>> -           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
>> - #endif
>> --#if PTHREAD_STACK_MIN > 0
>> -           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
>> --#endif
>> -           size = ((size+page_size-1)/page_size)*page_size;
>> -           int res = pthread_attr_setstacksize(&val_, size);
>> -           BOOST_VERIFY(!res && "pthread_attr_setstacksize failed");
>> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
>> mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
>> mongodb_git.bb
>> index 21051a8958..f1a508f3f2 100644
>> --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
>> mongodb_git.bb
>> +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/
>> mongodb_git.bb
>> @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \
>>
>>  inherit scons dos2unix siteinfo python3native systemd useradd
>>
>> -PV = "4.4.19"
>> -#v4.4.18
>> -SRCREV = "9a996e0ad993148b9650dc402e6d3b1804ad3b8a"
>> +PV = "4.4.24"
>> +#v4.4.24
>> +SRCREV = "0b86b9b7b42ad9970c5f818c527dd86c0634243a"
>>  SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https
>> \
>>
>> file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \
>>             file://0001-Use-long-long-instead-of-int64_t.patch \
>> @@ -29,7 +29,6 @@ SRC_URI = "git://
>> github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
>>             file://0001-include-needed-c-header.patch \
>>             file://disable_runtime_check.patch \
>>             file://ppc64_ARCH_BITS.patch \
>> -           file://PTHREAD_STACK_MIN.patch \
>>
>> file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \
>>
>> file://0001-server-Adjust-the-cache-alignment-assumptions.patch \
>>
>> file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \
>> --
>> 2.42.0
>>
>>
>>
>>
>>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105058):
> https://lists.openembedded.org/g/openembedded-devel/message/105058
> Mute This Topic: https://lists.openembedded.org/mt/101427962/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
diff mbox series

Patch

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
deleted file mode 100644
index f08177d7b4..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-PTHREAD_STACK_MIN is no longer a compile time define in glibc 2.34+ and since
-we only care for glibc and musl where PTHREAD_STACK_MIN is always defined there
-is no need to check for constant called PTHREAD_STACK_MIN since its already defined
-this fix may not work for wider audience but for OE needs its sufficient
-
-Upstream-Status: Inappropriate [OE-only fix]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp
-+++ b/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp
-@@ -57,9 +57,7 @@ namespace boost
- #else
-           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
--#endif
-           size = ((size+page_size-1)/page_size)*page_size;
-           int res = pthread_attr_setstacksize(&val_, size);
-           BOOST_VERIFY(!res && "pthread_attr_setstacksize failed");
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
index 21051a8958..f1a508f3f2 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
@@ -11,9 +11,9 @@  DEPENDS = "openssl libpcap zlib boost curl python3 \
 
 inherit scons dos2unix siteinfo python3native systemd useradd
 
-PV = "4.4.19"
-#v4.4.18
-SRCREV = "9a996e0ad993148b9650dc402e6d3b1804ad3b8a"
+PV = "4.4.24"
+#v4.4.24
+SRCREV = "0b86b9b7b42ad9970c5f818c527dd86c0634243a"
 SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
            file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \
            file://0001-Use-long-long-instead-of-int64_t.patch \
@@ -29,7 +29,6 @@  SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
            file://0001-include-needed-c-header.patch \
            file://disable_runtime_check.patch \
            file://ppc64_ARCH_BITS.patch \
-           file://PTHREAD_STACK_MIN.patch \
            file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \
            file://0001-server-Adjust-the-cache-alignment-assumptions.patch \
            file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \