From 4121a29f62ba2144317e76341c04fc1f9ad17bc7 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 8 Aug 2024 17:17:22 +0100 Subject: [PATCH 1/3] Split off 9.8.12 Signed-off-by: Gordon Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- version.cmake | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index bf827b15259..7f55a6deb84 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 9.8.11-closedown0 +version: 9.8.13-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 9.8.11-closedown0 +appVersion: 9.8.13-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index 9e65fc7e96c..53f11be68b8 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1477,7 +1477,7 @@ Pass in dict with .root, .visibility defined {{- end -}} {{- define "hpcc.generateHelmVersion" -}} -helmVersion: 9.8.11-closedown0 +helmVersion: 9.8.13-closedown0 {{- end -}} {{/* diff --git a/version.cmake b/version.cmake index bf8b33cd4bc..57750c465c8 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 8 ) -set ( HPCC_POINT 11 ) +set ( HPCC_POINT 13 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-08-02T10:50:02Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-08-08T16:17:22Z" ) ### From 0e5fafa48980e6b719e18b10730598718c338e32 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 8 Aug 2024 17:18:20 +0100 Subject: [PATCH 2/3] Split off 9.6.38 Signed-off-by: Gordon Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- version.cmake | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 4123d4c642a..1ccd1c3af10 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 9.6.37-closedown0 +version: 9.6.39-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 9.6.37-closedown0 +appVersion: 9.6.39-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index bdfe1faf4c6..298e37c5550 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1477,7 +1477,7 @@ Pass in dict with .root, .visibility defined {{- end -}} {{- define "hpcc.generateHelmVersion" -}} -helmVersion: 9.6.37-closedown0 +helmVersion: 9.6.39-closedown0 {{- end -}} {{/* diff --git a/version.cmake b/version.cmake index 90dd458ffa8..90d26bd3200 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 6 ) -set ( HPCC_POINT 37 ) +set ( HPCC_POINT 39 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-08-02T10:51:09Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-08-08T16:18:20Z" ) ### From 26329151e8397bc145a945e27253dc039f4f9f51 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Tue, 13 Aug 2024 14:40:48 +0100 Subject: [PATCH 3/3] HPCC-32422 Fix lookupjoin regression (introduced by HPCC-32313) Signed-off-by: Jake Smith --- system/jlib/jqueue.tpp | 2 ++ thorlcr/activities/lookupjoin/thlookupjoinslave.cpp | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/system/jlib/jqueue.tpp b/system/jlib/jqueue.tpp index f334469c4dc..3a47b61e1b4 100644 --- a/system/jlib/jqueue.tpp +++ b/system/jlib/jqueue.tpp @@ -358,6 +358,8 @@ public: stopped = false; } + bool queryStopped() const { return stopped; } + bool enqueue(BASE *e,unsigned timeout=INFINITE) { unsigned numToSignal = 0; diff --git a/thorlcr/activities/lookupjoin/thlookupjoinslave.cpp b/thorlcr/activities/lookupjoin/thlookupjoinslave.cpp index 0441534af72..2236833cc2b 100644 --- a/thorlcr/activities/lookupjoin/thlookupjoinslave.cpp +++ b/thorlcr/activities/lookupjoin/thlookupjoinslave.cpp @@ -177,7 +177,9 @@ class CBroadcaster : public CSimpleInterface // in theory each worker could be sending log(n) packets, with the broadcaster on each blocking waiting for acks unsigned limit = nodes * std::ceil(std::log2(nodes)); - broadcastQueue.setLimit(limit); + limit = broadcaster.activity.getOptInt("lookupJoinBroadcastQLimit", limit); + if (0 != limit) + broadcastQueue.setLimit(limit); } ~CSend() { @@ -203,8 +205,13 @@ class CBroadcaster : public CSimpleInterface return; } } - while (!broadcastQueue.enqueue(sendItem, 5000)) // will block if queue full + while (!broadcastQueue.enqueue(sendItem, 20000)) // will timeout if queue full { + if (broadcastQueue.queryStopped()) + { + DBGLOG("broadcastQueue stopped"); + break; + } DBGLOG("CSend::addBlock() - broadcastQueue full, waiting for space"); } }