opengris-scaler 1.12.12__cp310-cp310-manylinux_2_28_x86_64.whl → 1.12.13__cp310-cp310-manylinux_2_28_x86_64.whl

{opengris_scaler-1.12.12.dist-info → opengris_scaler-1.12.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: opengris-scaler
-Version: 1.12.12
+Version: 1.12.13
 Summary: OpenGRIS Scaler Distribution Framework
 Author-Email: Citi <opensource@citi.com>
 License: Apache 2.0
@@ -25,7 +25,7 @@ Provides-Extra: uvloop
 Requires-Dist: uvloop; platform_system != "Windows" and extra == "uvloop"
 Provides-Extra: gui
 Requires-Dist: nicegui[plotly]==2.24.2; python_version == "3.8" and extra == "gui"
-Requires-Dist: nicegui[plotly]==3.0.3; python_version >= "3.9" and extra == "gui"
+Requires-Dist: nicegui[plotly]==3.0.4; python_version >= "3.9" and extra == "gui"
 Provides-Extra: graphblas
 Requires-Dist: python-graphblas; extra == "graphblas"
 Requires-Dist: numpy==1.24.4; python_version == "3.8" and extra == "graphblas"
@@ -33,7 +33,7 @@ Requires-Dist: numpy==2.0.2; python_version == "3.9" and extra == "graphblas"
 Requires-Dist: numpy==2.2.6; python_version >= "3.10" and extra == "graphblas"
 Provides-Extra: all
 Requires-Dist: nicegui[plotly]==2.24.2; python_version == "3.8" and extra == "all"
-Requires-Dist: nicegui[plotly]==3.0.3; python_version >= "3.9" and extra == "all"
+Requires-Dist: nicegui[plotly]==3.0.4; python_version >= "3.9" and extra == "all"
 Requires-Dist: python-graphblas; extra == "all"
 Requires-Dist: numpy==1.24.4; python_version == "3.8" and extra == "all"
 Requires-Dist: numpy==2.0.2; python_version == "3.9" and extra == "all"

{opengris_scaler-1.12.12.dist-info → opengris_scaler-1.12.13.dist-info}/RECORD

@@ -3,7 +3,7 @@ opengris_scaler.libs/libkj-1-094aa318.1.0.so,sha256=dRbFbTaca-2vf1SS5LDL3WNfPzoE
 scaler/CMakeLists.txt,sha256=60rkhpiwy0F-DSsRX_6nRrjYQvQ1Jp9mGp8fZsi006k,305
 scaler/__init__.py,sha256=nZU5QZ9oW2YIaGwm3-r-6dfmirTVzZpDPDNtX-ITCV4,513
 scaler/about.py,sha256=OBcfSvHO0P3mWaa2Ci4WEOTbH7is-3uYymScxgZPxyg,161
-scaler/version.txt,sha256=_ybmMM5LatOmnnmjaCb5UGsJOUUCujnikVGbB3D0Atg,8
+scaler/version.txt,sha256=F6PMSyppBgeF1s1ced3yCqk9L1U1rOtqGWHlqvHibuU,8
 scaler/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/client/client.py,sha256=9WWclvdsouYPREGwmkWWA3gpz5DVFEAD6HKbtXr3Jx8,25506
 scaler/client/future.py,sha256=fOl5g4Is4E5jtvO0kmRk4uUs_eUjSjMmyniYhWMAH4w,10041
@@ -44,7 +44,7 @@ scaler/config/types/zmq.py,sha256=0VODax61H-4PxN6rIeWKlMXOHiW5elVSt1zc-UF0SL8,25
 scaler/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/entry_points/cluster.py,sha256=5jPO_fFVe8IiSiAkLhLZ0mXJKXiYUWjvpXjEGlcgwW4,5779
 scaler/entry_points/object_storage_server.py,sha256=YGDl9-ws0oha1YXXl3gFH660B-IV2o06gCp41zUovdg,1418
-scaler/entry_points/scheduler.py,sha256=w4Ps1PJX0dnu13xwnnuQFMppkW5Se7cIrcXuJlaWfTA,6025
+scaler/entry_points/scheduler.py,sha256=uJkmr1M3gzTEWmntdDr0f0-zls2V91vRPANahRjFj0c,6003
 scaler/entry_points/top.py,sha256=pqOPD27HeZrnMvqw4cOF4bvZ-sxgg7zp_Q1v8VtbC4A,9542
 scaler/entry_points/webui.py,sha256=ypcrE6Lr4rUX_qM0qSsv-dX7kzZiMMWTe5GL-Ol45BI,1067
 scaler/entry_points/worker_adapter_native.py,sha256=1If3xEu2YsnRIrAmcP-MXmnVTF7hescDed4jTL3vkzM,5412
@@ -61,29 +61,29 @@ scaler/io/utility.py,sha256=yFq8-X47RfWp344HpRfqc_3XF3c6vewKPLi73e248s8,1189
 scaler/io/ymq/CMakeLists.txt,sha256=znJS9ru-tjtn7Lv8RN1RJZVPhlHaE5AKS44z1Nnj_vE,1987
 scaler/io/ymq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/io/ymq/_ymq.pyi,sha256=HYLhjYhHTOgjffpAnlqyCSdUjEvKVRP7Slv8vIgGdkI,3036
-scaler/io/ymq/_ymq.so,sha256=UFRD4P1jQ3Jvoor7LiNyjj-aHS5Cg5YbfZi_BYE33Ak,1114112
+scaler/io/ymq/_ymq.so,sha256=6Jv1CR2aeZ6EAy0v5zzBjuutrkCSfjX6Oy2FhialeS4,1110016
 scaler/io/ymq/bytes.h,sha256=fxaZ0NMwzJC-agotCZbGizMs-IgPW4VWG4raeWBXC5I,2931
 scaler/io/ymq/common.h,sha256=XmYnfVeaIGZU3-gI2slw4uZyRrz807ANJXSQTf1joEY,711
 scaler/io/ymq/configuration.h,sha256=VvtSSGgD5dCOKc-gvtsqSBDoagaRnfnUS7jueDVsn9U,1951
-scaler/io/ymq/epoll_context.cpp,sha256=Sde1QRukul2ecD5EpTu8D-wy3u_tVN-FphvG5QM-3Aw,4937
+scaler/io/ymq/epoll_context.cpp,sha256=BE-Ol2p8-t61BajaEzLK-B2ABNNDiExVbb0Ym9BjbVA,4938
 scaler/io/ymq/epoll_context.h,sha256=0Cu840Utq6puRHCTVctCWpfdfNpUFcZJqw5D7e7hzSs,2641
 scaler/io/ymq/error.h,sha256=BUb55lcKou20u9e_GHZ0WEmlHJeC3VQWEzW-yTuRCTQ,5552
 scaler/io/ymq/event_loop.h,sha256=CDvcOszqtDSqkFt3t9hsT8n9HStbIchk7UO1u-3CTL0,1652
 scaler/io/ymq/event_loop_thread.cpp,sha256=0aYMmgpg8g6mmC-Ked2F3GCHNGJNXZAZLPobEQqu7g4,1801
-scaler/io/ymq/event_loop_thread.h,sha256=TiB_FZ6s8LE6pIBNeaQv2uuapXkoPG_JRWWywsibKHo,1593
+scaler/io/ymq/event_loop_thread.h,sha256=XNsVDH7r4tDBlU4VstrwMBGgOMOEsoDn7qLFjox1nEg,1683
 scaler/io/ymq/event_manager.h,sha256=WTRkNg8j8J_tLNU2ZtilVogC2EoLT5LrLIezeox5i80,2066
 scaler/io/ymq/interruptive_concurrent_queue.h,sha256=_hZkdfImpXT0L1fNsb-EfAYbaeTjQNmMGVMyZ6gT2Gg,4750
-scaler/io/ymq/io_context.cpp,sha256=MoIeg3xlSA9Q4S1O4FLXbjJSF7ZV5dRmaKJqUzQl200,3168
+scaler/io/ymq/io_context.cpp,sha256=nVjZCYE8zeYkWScDeYsXEh8AW9qhyORodn7etaT3-Vs,3080
 scaler/io/ymq/io_context.h,sha256=eYyXCnHWWfSPVykvvA0sdjjAnKq2y768t3Exg0EU_IA,1248
-scaler/io/ymq/io_socket.cpp,sha256=8fj8KjS_I7U8zwOLQasX7rDy8gkquTs9G-Vc1UXMmZE,11584
+scaler/io/ymq/io_socket.cpp,sha256=Li6P-7R80YwduaL59_D2wQ36twufdIIXaP7IS46zSwQ,11506
 scaler/io/ymq/io_socket.h,sha256=lWqfJHZg6OGxz16x2NwKKbtvjfErrC4IUP3puw72Nwg,4953
 scaler/io/ymq/iocp_context.cpp,sha256=SRGEn5MVoWl8JUIO2sZDUQi6AbhrXfhQ-aRoWiaF2SY,3103
 scaler/io/ymq/iocp_context.h,sha256=pAwrs8XZWHIskEdQyA5BrISxsiSzfW6r9J873pBMs4Q,2731
 scaler/io/ymq/logging.h,sha256=TJFeawseU8zkWiSC_yS3dO2i0oKAWAZFzyb_vk0tU7Q,5421
 scaler/io/ymq/message.h,sha256=yBAd5BIeDttWqseyoUBPKPnD1qT05o_vlqEN3J53lP4,241
 scaler/io/ymq/message_connection.h,sha256=dvkIjMt31gPFephJURtxcqm7TFAWZ3y0ZvuekXFL3_Q,350
-scaler/io/ymq/message_connection_tcp.cpp,sha256=_iwRfCxajpEWHfBPtendYRpeZE-OyjW05_OztZKXLxk,21779
-scaler/io/ymq/message_connection_tcp.h,sha256=rxLF6MaCnkQW4Zke_5LvD180IC-9l65yyBiA4xwORJU,2728
+scaler/io/ymq/message_connection_tcp.cpp,sha256=yxIFZBzShzAEUUtHXhSj6sy_udRC-Jw-TwvZk3Vio6Q,21902
+scaler/io/ymq/message_connection_tcp.h,sha256=C7jo2fVeHqdhIk8cAaVNAnnF8IyIIJT0EZC1Sf_MDe4,2743
 scaler/io/ymq/network_utils.h,sha256=qebEdeKYpztZLI02c25eqcRmFMqBZN3GEaE81fiyBF8,4142
 scaler/io/ymq/readme.md,sha256=gzjJJovTVjV0e-4QpjrscT0gmtDiPjszAIlVt5upshg,3739
 scaler/io/ymq/simple_interface.cpp,sha256=BpsjGW3xGCajnQDa9UN8GJA_Xu15LfJTU4IRnsGOA04,2912
@@ -101,12 +101,12 @@ scaler/io/ymq/ymq.py,sha256=d8bxU0h2maQvIkiJgGeTD-QynCOa4JwYCwuVfxqq9AE,4658
 scaler/io/ymq/pymod_ymq/bytes.h,sha256=srlYnWibw2a9mgulzCc5H-7TnMob8QWA2ChAdbZ4bxw,3135
 scaler/io/ymq/pymod_ymq/exception.h,sha256=4nfUpc8VJDRZeBvgmOZN_j0FHmryZTbxzzBrWQKhhG4,3573
 scaler/io/ymq/pymod_ymq/gil.h,sha256=YdFOBWEBC1TSYmIvzr5NDZf-xmm49PMGqYP2nh-5Fk8,403
-scaler/io/ymq/pymod_ymq/io_context.h,sha256=HZs3rTDLW5tVHhH_a5crXLvnozZB9eHioxJ5xH87cVU,5005
-scaler/io/ymq/pymod_ymq/io_socket.h,sha256=Y5Tzt_T4z-Kiinb9zzJj-2ovG0OUs6aKwZ8AH5RdSTk,9415
+scaler/io/ymq/pymod_ymq/io_context.h,sha256=03DcUlHCZyk78rNJmxRFgjxFOiQLWCq5FLm-gEENi0k,5014
+scaler/io/ymq/pymod_ymq/io_socket.h,sha256=1M7NhhyP3alEJ9fnS04cwY9Frz4b5gZ19qPCCGxSeLQ,9674
 scaler/io/ymq/pymod_ymq/message.h,sha256=gqYKDnNCK9W1q0gte0pGfbmx119gQvcWBaJzIFdRsuc,3039
 scaler/io/ymq/pymod_ymq/python.h,sha256=wb0-WNF4occ4nDphSoUI47_OrfVPP72eLlGC_B59b7c,4284
 scaler/io/ymq/pymod_ymq/ymq.cpp,sha256=LoxL5ViLK0zyWRSYfmZn0QO-0vLw3xVZrRQJ5rWtc4w,526
-scaler/io/ymq/pymod_ymq/ymq.h,sha256=juX5DcDMY8rxp5BixFR0NgSlTrLBPog4JdqyQB9NfVI,11936
+scaler/io/ymq/pymod_ymq/ymq.h,sha256=p3cNnvgv8R1ThCBM56G-OlINWZsm1Xd0o14kpItG9gw,11892
 scaler/io/ymq/third_party/concurrentqueue.h,sha256=yN268t8miyojar0bBBPIEjMI3DlHVZci2eufkDDA0FA,152819
 scaler/object_storage/CMakeLists.txt,sha256=qexi6sKNGieaRhKkO65kxdaQrKRY-8adYKlvc42aEew,1566
 scaler/object_storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -119,8 +119,8 @@ scaler/object_storage/message.h,sha256=8KCts7n36jys3PiX09-lPtfa6DjfHI_2hYvled9af
 scaler/object_storage/object_manager.cpp,sha256=cxNv9vOkCC910hlF5JF0mOUwTho8ieA1RJgF_P4e3ho,3083
 scaler/object_storage/object_manager.h,sha256=TkxICR8_20I-tkHwnMO0VpLWkm24vOEabrmQG6hdnmQ,1696
 scaler/object_storage/object_storage_server.cpp,sha256=ZiMpLOakguD3p108OVRf0XQmsZtHN5tw5Fs46Pq0nwA,13794
-scaler/object_storage/object_storage_server.h,sha256=11BD3U9NnLcqx8hFXJCnTjvQEgyirj-0LKlTYgtzaXI,4277
-scaler/object_storage/object_storage_server.so,sha256=gRAh57dLp8zwm_Wg9_ViORPQ_v6gtIMSOM_r0_WJPQs,1349217
+scaler/object_storage/object_storage_server.h,sha256=X8W4QFHgNUmBOsJ-JfADfMu9Z4pti8OFYyMR3C1Am1Q,4244
+scaler/object_storage/object_storage_server.so,sha256=9CJBS73SmJpp5bcvt6funF6jU5ctHfqMQgzR8lZBbug,1349217
 scaler/object_storage/pymod_object_storage_server.cpp,sha256=D09p81wZF6WnV35I6od3iDhgktV20v82CRR_tQ90ROs,3811
 scaler/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/protocol/introduction.md,sha256=G8oRzui4KmSlfFUu70y24tTmDmfEKBkog9tFVUn7G1U,5406
@@ -222,10 +222,10 @@ scaler/worker_adapter/symphony/message.py,sha256=HOonEASua8e-uwpPVxprjyl1rrYmFJa
 scaler/worker_adapter/symphony/task_manager.py,sha256=phgx8dtAv-5ynsvsmG4DKcSlENz4b340FE6LDUWyMwo,12139
 scaler/worker_adapter/symphony/worker.py,sha256=VIDOoqVXbwrjHYN3lghbQpEIuCbVJUgiYsBknrI-0oc,7957
 scaler/worker_adapter/symphony/worker_adapter.py,sha256=eAAD1O0Uz1pjEdQPPl2fd8kyaF6q-aqCRrg48k1ocUU,5455
-opengris_scaler-1.12.12.dist-info/METADATA,sha256=It2hi9UNQsgtbh--T9GMMiPlwYH2CnWCXEYrcY_uEV4,27234
-opengris_scaler-1.12.12.dist-info/WHEEL,sha256=WfUIOrZZjmphW6XvWWOC-3zHgyiL7DZcrARpY3z4EcQ,118
-opengris_scaler-1.12.12.dist-info/entry_points.txt,sha256=KROw4kj4Z6p8YuOgpOFt5spHskm87A7Z-fOOffT4tVU,446
-opengris_scaler-1.12.12.dist-info/RECORD,,
-opengris_scaler-1.12.12.dist-info/licenses/LICENSE,sha256=xudC0jta6OXJkSHiLzzQQU50HIwSo0G97exO280dtR8,11345
-opengris_scaler-1.12.12.dist-info/licenses/LICENSE.spdx,sha256=i49Qe6AmXxuvocKyExEFduvdh-NQ5YuxdHs515G8VOQ,225
-opengris_scaler-1.12.12.dist-info/licenses/NOTICE,sha256=JUHdG2ssq0nP2QsqPM8X2eJhfJhK_lemIvDBqBRXrMo,286
+opengris_scaler-1.12.13.dist-info/METADATA,sha256=ETTF9ysLYGYoViBW74q-0f5eprUiesTpR2y7hl0ijwk,27234
+opengris_scaler-1.12.13.dist-info/WHEEL,sha256=WfUIOrZZjmphW6XvWWOC-3zHgyiL7DZcrARpY3z4EcQ,118
+opengris_scaler-1.12.13.dist-info/entry_points.txt,sha256=KROw4kj4Z6p8YuOgpOFt5spHskm87A7Z-fOOffT4tVU,446
+opengris_scaler-1.12.13.dist-info/RECORD,,
+opengris_scaler-1.12.13.dist-info/licenses/LICENSE,sha256=xudC0jta6OXJkSHiLzzQQU50HIwSo0G97exO280dtR8,11345
+opengris_scaler-1.12.13.dist-info/licenses/LICENSE.spdx,sha256=i49Qe6AmXxuvocKyExEFduvdh-NQ5YuxdHs515G8VOQ,225
+opengris_scaler-1.12.13.dist-info/licenses/NOTICE,sha256=JUHdG2ssq0nP2QsqPM8X2eJhfJhK_lemIvDBqBRXrMo,286

scaler/entry_points/scheduler.py

@@ -93,7 +93,10 @@ def main():
 
     scheduler_config = load_config(SchedulerConfig, args.config, args, section_name="scheduler")
 
-    if args.object_storage_address is None:
+    object_storage_address = scheduler_config.object_storage_address
+    object_storage = None
+
+    if object_storage_address is None:
         object_storage_address = ObjectStorageConfig(
             host=scheduler_config.scheduler_address.host, port=get_available_tcp_port()
         )
@@ -105,9 +108,6 @@ def main():
         )
         object_storage.start()
         object_storage.wait_until_ready()  # object storage should be ready before starting the cluster
-    else:
-        object_storage_address = scheduler_config.object_storage_address
-        object_storage = None
 
     scheduler = SchedulerProcess(
         address=scheduler_config.scheduler_address,

scaler/io/ymq/epoll_context.cpp

@@ -41,7 +41,7 @@ void EpollContext::loop()
                 // todo: investigate better error handling
                 // the epoll thread is not expected to receive signals(?)
                 // but occasionally does (e.g. sigwinch) and we shouldn't stop the thread in that case
-                break;
+                return;
             case EBADF:
             case EFAULT:
             case EINVAL:

scaler/io/ymq/event_loop_thread.h

@@ -38,6 +38,12 @@ public:
     EventLoopThread& operator=(const EventLoopThread&) = delete;
     EventLoopThread()                                  = default;
 
+    void tryJoin()
+    {
+        if (thread.joinable())
+            thread.join();
+    }
+
 private:
     std::jthread thread;
 };

scaler/io/ymq/io_context.cpp

@@ -76,15 +76,14 @@ void IOContext::removeIOSocket(std::shared_ptr<IOSocket>& socket) noexcept
         }
     }
     if (id != -1) {
-        assert(_threads[id].use_count() == 1);
+        _threads[id]->tryJoin();
         _threads[id] = std::make_shared<EventLoopThread>();
     }
 }
 
 void IOContext::requestIOSocketStop(std::shared_ptr<IOSocket> socket) noexcept
 {
-    socket->_eventLoopThread->_eventLoop.executeNow(
-        [socket] { socket->_eventLoopThread->_eventLoop.executeLater([socket] { socket->requestStop(); }); });
+    socket->_eventLoopThread->_eventLoop.executeNow([socket] { socket->requestStop(); });
 }
 
 IOContext::~IOContext() noexcept

scaler/io/ymq/io_socket.cpp

@@ -145,14 +145,11 @@ void IOSocket::bindTo(std::string networkAddress, BindReturnCallback onBindRetur
 void IOSocket::closeConnection(Identity remoteSocketIdentity) noexcept
 {
     _eventLoopThread->_eventLoop.executeNow([this, remoteIdentity = std::move(remoteSocketIdentity)] {
-        _eventLoopThread->_eventLoop.executeLater([this, remoteIdentity = std::move(remoteIdentity)] {
-            if (_stopped) {
-                return;
-            }
-            // _identityToConnection.erase(remoteIdentity);
-            if (_identityToConnection.contains(remoteIdentity))
-                _identityToConnection[remoteIdentity]->disconnect();
-        });
+        if (_stopped) {
+            return;
+        }
+        if (_identityToConnection.contains(remoteIdentity))
+            _identityToConnection[remoteIdentity]->disconnect();
     });
 }
 
@@ -179,6 +176,7 @@ void IOSocket::onConnectionDisconnected(MessageConnectionTCP* conn, bool keepInB
                 this->_pendingRecvMessages->pop();
             }
         }
+        _eventLoopThread->_eventLoop.executeLater([conn = std::move(connPtr)]() {});
         _unestablishedConnection.pop_back();
         return;
     }
@@ -244,6 +242,7 @@ void IOSocket::onConnectionIdentityReceived(MessageConnectionTCP* conn) noexcept
     assert(targetConn->_receivedReadOperations.empty());
     targetConn->_receivedReadOperations = std::move((*c)->_receivedReadOperations);
 
+    assert((*c)->_connFd == 0);
     _unestablishedConnection.erase(c);
 }
 

scaler/io/ymq/message_connection_tcp.cpp

@@ -321,6 +321,9 @@ void MessageConnectionTCP::onRead()
                        return _remoteIOSocketIdentity;
                    })
                    .and_then([this, maybeCloseConn](const std::string&) -> std::optional<std::string> {
+                       if (!_connFd) {
+                           return _remoteIOSocketIdentity;
+                       }
                        auto _ = tryReadMessages()
                                     .or_else(maybeCloseConn)  //
                                     .and_then([this]() -> std::expected<void, IOError> {

scaler/io/ymq/message_connection_tcp.h

@@ -62,8 +62,9 @@ private:
     void onClose();
     void onError()
     {
-        onRead();
-        // onClose();
+        if (_connFd) {
+            onRead();
+        }
     };
 
     std::expected<void, IOError> tryReadOneMessage();

scaler/io/ymq/pymod_ymq/io_context.h

@@ -105,20 +105,21 @@ static PyObject* PyIOContext_createIOSocket(PyIOContext* self, PyObject* args, P
     if (!ioSocket)
         return nullptr;
 
-    Py_INCREF(callback);
-
     try {
         // ensure the fields are init
         new (&ioSocket->socket) std::shared_ptr<IOSocket>();
         new (&ioSocket->ioContext) std::shared_ptr<IOContext>();
         ioSocket->ioContext = self->ioContext;
 
+        Py_INCREF(callback);
+
         self->ioContext->createIOSocket(
             std::string(identity, identityLen), socketType, [callback, ioSocket](auto socket) {
                 AcquireGIL _;
 
-                ioSocket->socket = socket;
-                OwnedPyObject _result  = PyObject_CallFunctionObjArgs(callback, *ioSocket, nullptr);
+                ioSocket->socket      = socket;
+                OwnedPyObject _result = PyObject_CallFunctionObjArgs(callback, *ioSocket, nullptr);
+
                 Py_DECREF(callback);
             });
     } catch (...) {

scaler/io/ymq/pymod_ymq/io_socket.h

@@ -57,8 +57,8 @@ static PyObject* PyIOSocket_send(PyIOSocket* self, PyObject* args, PyObject* kwa
     if (!state)
         return nullptr;
 
-    PyObject* callback   = nullptr;
-    PyMessage* message   = nullptr;
+    PyObject* callback = nullptr;
+    PyMessage* message = nullptr;
 
     // empty str -> positional only
     const char* kwlist[] = {"", "message", nullptr};
@@ -73,9 +73,9 @@ static PyObject* PyIOSocket_send(PyIOSocket* self, PyObject* args, PyObject* kwa
     auto address = message->address.is_none() ? Bytes() : std::move(message->address->bytes);
     auto payload = std::move(message->payload->bytes);
 
-    Py_INCREF(callback);
-
     try {
+        Py_INCREF(callback);
+
         self->socket->sendMessage(
             {.address = std::move(address), .payload = std::move(payload)}, [callback, state](auto result) {
                 AcquireGIL _;
@@ -108,35 +108,45 @@ static PyObject* PyIOSocket_recv(PyIOSocket* self, PyObject* args, PyObject* kwa
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O", (char**)kwlist, &callback))
         return nullptr;
 
-    Py_INCREF(callback);
-
     try {
+        Py_INCREF(callback);
+
         self->socket->recvMessage([callback, state](std::pair<Message, Error> result) {
             AcquireGIL _;
 
             if (result.second._errorCode != Error::ErrorCode::Uninit) {
                 OwnedPyObject obj = YMQException_createFromCoreError(state, &result.second);
                 OwnedPyObject _   = PyObject_CallFunctionObjArgs(callback, *obj, nullptr);
+                Py_DECREF(callback);
                 return;
             }
 
             auto message                      = result.first;
             OwnedPyObject<PyBytesYMQ> address = (PyBytesYMQ*)PyObject_CallNoArgs(*state->PyBytesYMQType);
-            if (!address)
-                return completeCallbackWithRaisedException(callback);
+            if (!address) {
+                completeCallbackWithRaisedException(callback);
+                Py_DECREF(callback);
+                return;
+            }
 
             address->bytes = std::move(message.address);
 
             OwnedPyObject<PyBytesYMQ> payload = (PyBytesYMQ*)PyObject_CallNoArgs(*state->PyBytesYMQType);
-            if (!payload)
-                return completeCallbackWithRaisedException(callback);
+            if (!payload) {
+                completeCallbackWithRaisedException(callback);
+                Py_DECREF(callback);
+                return;
+            }
 
             payload->bytes = std::move(message.payload);
 
             OwnedPyObject<PyMessage> pyMessage =
                 (PyMessage*)PyObject_CallFunction(*state->PyMessageType, "OO", *address, *payload);
-            if (!pyMessage)
-                return completeCallbackWithRaisedException(callback);
+            if (!pyMessage) {
+                completeCallbackWithRaisedException(callback);
+                Py_DECREF(callback);
+                return;
+            }
 
             OwnedPyObject _result = PyObject_CallFunctionObjArgs(callback, *pyMessage, nullptr);
             Py_DECREF(callback);
@@ -162,9 +172,9 @@ static PyObject* PyIOSocket_bind(PyIOSocket* self, PyObject* args, PyObject* kwa
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Os#", (char**)kwlist, &callback, &address, &addressLen))
         return nullptr;
 
-    Py_INCREF(callback);
-
     try {
+        Py_INCREF(callback);
+
         self->socket->bindTo(std::string(address, addressLen), [callback, state](auto result) {
             AcquireGIL _;
 
@@ -198,9 +208,9 @@ static PyObject* PyIOSocket_connect(PyIOSocket* self, PyObject* args, PyObject*
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Os#", (char**)kwlist, &callback, &address, &addressLen))
         return nullptr;
 
-    Py_INCREF(callback);
-
     try {
+        Py_INCREF(callback);
+
         self->socket->connectTo(std::string(address, addressLen), [callback, state](auto result) {
             AcquireGIL _;
 

scaler/io/ymq/pymod_ymq/ymq.h

@@ -20,13 +20,13 @@ struct YMQState {
     OwnedPyObject<> enumModule;     // Reference to the enum module
     OwnedPyObject<> asyncioModule;  // Reference to the asyncio module
 
-    OwnedPyObject<> PyIOSocketEnumType;          // Reference to the IOSocketType enum
-    OwnedPyObject<> PyErrorCodeType;             // Reference to the Error enum
-    OwnedPyObject<> PyBytesYMQType;              // Reference to the PyBytesYMQ type
-    OwnedPyObject<> PyMessageType;               // Reference to the Message type
-    OwnedPyObject<> PyIOSocketType;              // Reference to the IOSocket type
-    OwnedPyObject<> PyIOContextType;             // Reference to the IOContext type
-    OwnedPyObject<> PyExceptionType;             // Reference to the Exception type
+    OwnedPyObject<> PyIOSocketEnumType;  // Reference to the IOSocketType enum
+    OwnedPyObject<> PyErrorCodeType;     // Reference to the Error enum
+    OwnedPyObject<> PyBytesYMQType;      // Reference to the PyBytesYMQ type
+    OwnedPyObject<> PyMessageType;       // Reference to the Message type
+    OwnedPyObject<> PyIOSocketType;      // Reference to the IOSocket type
+    OwnedPyObject<> PyIOContextType;     // Reference to the IOContext type
+    OwnedPyObject<> PyExceptionType;     // Reference to the Exception type
 };
 
 static YMQState* YMQStateFromSelf(PyObject* self)
@@ -76,8 +76,8 @@ std::expected<PyObject*, PyObject*> YMQ_GetRaisedException()
 
 void completeCallbackWithRaisedException(PyObject* callback)
 {
-    auto result = YMQ_GetRaisedException();
-    OwnedPyObject _   =PyObject_CallFunctionObjArgs(callback, result.value_or(result.error()));
+    auto result     = YMQ_GetRaisedException();
+    OwnedPyObject _ = PyObject_CallFunctionObjArgs(callback, result.value_or(result.error()), nullptr);
 }
 
 // First-Party

scaler/object_storage/object_storage_server.h

@@ -69,8 +69,6 @@ private:
 
     scaler::ymq::Logger _logger;
 
-    std::atomic<bool> _stopped;
-
     std::vector<SendMessageFuture> _pendingSendMessageFuts;
 
     void initServerReadyFds();

scaler/version.txt

@@ -1 +1 @@
-1.12.12
+1.12.13