opengris-scaler 1.12.12__tar.gz → 1.12.13__tar.gz

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/PKG-INFO

@@ -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 → opengris_scaler-1.12.13}/pyproject.toml

@@ -36,7 +36,7 @@ uvloop = [
 ]
 gui = [
     "nicegui[plotly]==2.24.2; python_version == '3.8'",
-    "nicegui[plotly]==3.0.3; python_version >= '3.9'",
+    "nicegui[plotly]==3.0.4; python_version >= '3.9'",
 ]
 graphblas = [
     "python-graphblas",
@@ -46,7 +46,7 @@ graphblas = [
 ]
 all = [
     "nicegui[plotly]==2.24.2; python_version == '3.8'",
-    "nicegui[plotly]==3.0.3; python_version >= '3.9'",
+    "nicegui[plotly]==3.0.4; python_version >= '3.9'",
     "python-graphblas",
     "numpy==1.24.4; python_version == '3.8'",
     "numpy==2.0.2; python_version == '3.9'",

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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,

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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:

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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;
 };

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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);
 }
 

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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> {

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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();

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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 (...) {

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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 _;
 

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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

{opengris_scaler-1.12.12 → opengris_scaler-1.12.13}/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();

opengris_scaler-1.12.13/scaler/version.txt

@@ -0,0 +1 @@
+1.12.13

opengris_scaler-1.12.12/scaler/version.txt

@@ -1 +0,0 @@
-1.12.12