opengris-scaler 1.12.7__tar.gz → 1.12.9__tar.gz

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/CMakeLists.txt

@@ -103,6 +103,18 @@ find_package(CapnProto CONFIG REQUIRED)
 get_target_property(CAPNP_INCLUDE_DIRS CapnProto::capnp INTERFACE_INCLUDE_DIRECTORIES)
 message(STATUS "Found Capnp includes in ${CAPNP_INCLUDE_DIRS}")
 
+execute_process(
+  COMMAND python3-config --prefix
+  OUTPUT_VARIABLE PYTHON_PREFIX
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+set(Python3_ROOT_DIR "${PYTHON_PREFIX}")
+
+find_package(Python3 REQUIRED COMPONENTS Development.Module)
+message(STATUS "Python version: ${Python3_VERSION}")
+message(STATUS "Python include dirs: ${Python3_INCLUDE_DIRS}")
+message(STATUS "Python ABI: ${Python3_SOABI}")
+
 # Make LSP happy
 include_directories(${CAPNP_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR})

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: opengris-scaler
-Version: 1.12.7
+Version: 1.12.9
 Summary: OpenGRIS Scaler Distribution Framework
 Author-Email: Citi <opensource@citi.com>
 License: Apache 2.0

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/examples/cpp/ymq/automated_echo_client.cpp

@@ -40,7 +40,7 @@ int main()
 
     const std::string_view line = longStr;
 
-    for (int cnt = 0; cnt < msgCnt; ++cnt) {
+    for (size_t cnt = 0; cnt < msgCnt; ++cnt) {
         Message message;
         std::string destAddress = "ServerSocket";
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/examples/cpp/ymq/pingpong.cpp

@@ -42,7 +42,7 @@ int main(int argc, char* argv[])
     const std::string_view line = longStr;
 
     time_point<system_clock> start = system_clock::now();
-    for (int cnt = 0; cnt < msgCnt; ++cnt) {
+    for (size_t cnt = 0; cnt < msgCnt; ++cnt) {
         Message message {};
         message.payload = Bytes {const_cast<char*>(line.data()), line.size()};
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/config/loader.py

@@ -1,11 +1,12 @@
 import argparse
 import dataclasses
 import enum
+import sys
 from typing import Any, cast, Dict, Optional, Type, TypeVar, Union, get_args, get_origin
 
-try:
+if sys.version_info >= (3, 11):
     import tomllib
-except ImportError:
+else:
     import tomli as tomllib
 
 from scaler.config.mixins import ConfigType

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/config/mixins.py

@@ -1,5 +1,10 @@
 import abc
-from typing_extensions import Self
+import sys
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 
 class ConfigType(metaclass=abc.ABCMeta):

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/config/types/worker.py

@@ -1,6 +1,11 @@
 import dataclasses
+import sys
 from typing import List, Dict
-from typing_extensions import Self
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 from scaler.config.mixins import ConfigType
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/config/types/zmq.py

@@ -1,8 +1,12 @@
 import dataclasses
 import enum
+import sys
 from typing import Optional
 
-from typing_extensions import Self
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 from scaler.config.mixins import ConfigType
 
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/io/ymq/CMakeLists.txt

@@ -58,7 +58,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scaler/io/ymq)
 
 if(LINUX)
     # ymq python =======================================================================================================
-    find_package(Python3 COMPONENTS Development.Module REQUIRED)
 
     add_library(py_ymq SHARED
         pymod_ymq/bytes.h

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/io/ymq/epoll_context.h

@@ -12,7 +12,6 @@
 #include "scaler/io/ymq/timed_queue.h"
 
 // First-party
-#include "scaler/io/ymq/file_descriptor.h"
 #include "scaler/io/ymq/interruptive_concurrent_queue.h"
 #include "scaler/io/ymq/timestamp.h"
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/object_storage/CMakeLists.txt

@@ -21,8 +21,6 @@ add_library(object_storage_server_objs OBJECT
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scaler/object_storage)
 
 # object_storage_server python =========================================================================================
-find_package(Python3 REQUIRED COMPONENTS Development.Module)
-
 add_library(py_object_storage_server MODULE
     pymod_object_storage_server.cpp
 )

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/object_storage/object_storage_server.cpp

@@ -29,7 +29,8 @@ void ObjectStorageServer::run(
     ObjectStorageServer::Identity identity,
     std::string log_level,
     std::string log_format,
-    std::vector<std::string> log_paths)
+    std::vector<std::string> log_paths,
+    std::function<bool()> running)
 {
     _logger = scaler::ymq::Logger(log_format, std::move(log_paths), scaler::ymq::Logger::stringToLogLevel(log_level));
 
@@ -44,7 +45,7 @@ void ObjectStorageServer::run(
 
         _logger.log(scaler::ymq::Logger::LoggingLevel::info, "ObjectStorageServer: started");
 
-        processRequests();
+        processRequests(running);
 
         _ioContext.removeIOSocket(_ioSocket);
     } catch (const std::exception& e) {
@@ -117,7 +118,7 @@ void ObjectStorageServer::closeServerReadyFds()
     }
 }
 
-void ObjectStorageServer::processRequests()
+void ObjectStorageServer::processRequests(std::function<bool()> running)
 {
     using namespace std::chrono_literals;
     Identity lastMessageIdentity;
@@ -134,7 +135,13 @@ void ObjectStorageServer::processRequests()
                 }
             });
 
-            auto maybeMessage = ymq::syncRecvMessage(_ioSocket);
+            auto maybeMessageFuture = ymq::futureRecvMessage(_ioSocket);
+            while (maybeMessageFuture.wait_for(100ms) == std::future_status::timeout) {
+                if (!running()) {
+                    return;
+                }
+            }
+            auto maybeMessage = maybeMessageFuture.get();
 
             if (!maybeMessage) {
                 auto error = maybeMessage.error();

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/object_storage/object_storage_server.h

@@ -35,7 +35,8 @@ public:
         Identity identity                  = "ObjectStorageServer",
         std::string log_level              = "INFO",
         std::string log_format             = "%(levelname)s: %(message)s",
-        std::vector<std::string> log_paths = {"/dev/stdout"});
+        std::vector<std::string> log_paths = {"/dev/stdout"},
+        std::function<bool()> running      = []() { return true; });
 
     void waitUntilReady();
 
@@ -78,7 +79,7 @@ private:
 
     void closeServerReadyFds();
 
-    void processRequests();
+    void processRequests(std::function<bool()> stopCondition);
 
     void processSetRequest(std::shared_ptr<Client> client, std::pair<ObjectRequestHeader, Bytes> request);
 

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/scaler/object_storage/pymod_object_storage_server.cpp

@@ -1,6 +1,8 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+#include <pyerrors.h>
 
+#include "scaler/io/ymq/pymod_ymq/gil.h"
 #include "scaler/object_storage/object_storage_server.h"
 
 extern "C" {
@@ -52,10 +54,19 @@ static PyObject* PyObjectStorageServerRun(PyObject* self, PyObject* args)
         logging_paths.push_back(PyUnicode_AsUTF8(path_obj));
     }
 
+    auto running = []() -> bool {
+        AcquireGIL gil;
+        (void)gil;
+        return PyErr_CheckSignals() == 0;
+    };
+
     ((PyObjectStorageServer*)self)
-        ->server.run(addr, std::to_string(port), identity, log_level, log_format, std::move(logging_paths));
+        ->server.run(
+            addr, std::to_string(port), identity, log_level, log_format, std::move(logging_paths), std::move(running));
 
-    Py_RETURN_NONE;
+    // TODO: Ideally, run should return a bool and we return failure with nullptr.
+    return nullptr;
+    // Py_RETURN_NONE;
 }
 
 static PyObject* PyObjectStorageServerWaitUntilReady(PyObject* self, [[maybe_unused]] PyObject* args)

opengris_scaler-1.12.9/scaler/version.txt

@@ -0,0 +1 @@
+1.12.9

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/tests/cpp/ymq/common.h

@@ -28,12 +28,10 @@
 #include <ctime>
 #include <exception>
 #include <filesystem>
-#include <format>
 #include <functional>
 #include <iostream>
 #include <optional>
 #include <print>
-#include <stdexcept>
 #include <string>
 #include <system_error>
 #include <thread>
@@ -471,13 +469,26 @@ inline TestResult run_python(const char* path, std::vector<const wchar_t*> argv
     if (PyStatus_Exception(status))
         goto exception;
 
+    argv.insert(argv.begin(), L"mitm");
+    status = PyConfig_SetArgv(&config, argv.size(), (wchar_t**)argv.data());
+    if (PyStatus_Exception(status))
+        goto exception;
+
+    // pass argv to the script as-is
+    config.parse_argv = 0;
+
     status = Py_InitializeFromConfig(&config);
     if (PyStatus_Exception(status))
         goto exception;
     PyConfig_Clear(&config);
 
-    argv.insert(argv.begin(), L"mitm");
-    PySys_SetArgv(argv.size(), (wchar_t**)argv.data());
+    // add the cwd to the path
+    {
+        PyObject* sysPath = PySys_GetObject("path");
+        PyObject* newPath = PyUnicode_FromString(".");
+        PyList_Append(sysPath, newPath);
+        Py_DECREF(newPath);
+    }
 
     {
         auto file = fopen(path, "r");

{opengris_scaler-1.12.7 → opengris_scaler-1.12.9}/tests/cpp/ymq/py_mitm/main.py

@@ -8,7 +8,6 @@ import argparse
 import os
 import signal
 import subprocess
-import types
 from typing import List
 from scapy.all import IP, TCP, TunTapInterface  # type: ignore
 

opengris_scaler-1.12.9/tests/test_cluster_config.py

@@ -0,0 +1,49 @@
+import os
+import tempfile
+import unittest
+from argparse import Namespace
+
+from scaler.config.loader import load_config
+from scaler.config.section.cluster import ClusterConfig
+
+
+class TestClusterConfig(unittest.TestCase):
+    """Tests for the ClusterConfig class."""
+
+    def setUp(self):
+        self.temp_dir = tempfile.TemporaryDirectory()
+        self.config_path = os.path.join(self.temp_dir.name, "cluster.toml")
+        with open(self.config_path, "w") as f:
+            f.write(
+                """
+scheduler_address = "tcp://127.0.0.1:5555"
+num_of_workers = 2
+worker_names = "w1,w2"
+"""
+            )
+
+    def tearDown(self):
+        self.temp_dir.cleanup()
+
+    def test_load_from_toml_only(self):
+        """Test loading ClusterConfig from a flat TOML file."""
+        config = load_config(ClusterConfig, self.config_path, Namespace())
+        self.assertEqual(str(config.scheduler_address), "tcp://127.0.0.1:5555")
+        self.assertEqual(config.num_of_workers, 2)
+        self.assertEqual(config.worker_names.names, ["w1", "w2"])
+
+    def test_command_line_overrides_toml(self):
+        """Test that argparse args correctly override TOML values for ClusterConfig."""
+        worker_list = [f"worker_{i}" for i in range(20)]
+        args = Namespace(num_of_workers=20, worker_names=",".join(worker_list), heartbeat_interval_seconds=99)
+
+        config = load_config(ClusterConfig, self.config_path, args)
+
+        self.assertEqual(config.num_of_workers, 20)
+        self.assertEqual(config.worker_names.names, worker_list)
+        self.assertEqual(config.heartbeat_interval_seconds, 99)
+        self.assertEqual(str(config.scheduler_address), "tcp://127.0.0.1:5555")
+
+
+if __name__ == "__main__":
+    unittest.main()

opengris_scaler-1.12.9/tests/test_config_types.py

@@ -0,0 +1,50 @@
+import unittest
+
+from scaler.config.types.worker import WorkerCapabilities, WorkerNames
+from scaler.config.types.zmq import ZMQConfig
+
+
+class TestConfigTypes(unittest.TestCase):
+    """Tests for individual ConfigType helper classes."""
+
+    def test_zmq_config_validation(self):
+        """Test ZMQConfig.from_string raises ValueError for malformed strings."""
+        with self.assertRaises(ValueError):
+            ZMQConfig.from_string("this-is-not-a-valid-address")
+        with self.assertRaises(ValueError):
+            ZMQConfig.from_string("tcp://127.0.0.1")
+        with self.assertRaises(ValueError):
+            ZMQConfig.from_string("badprotocol://127.0.0.1:1234")
+
+        cfg = ZMQConfig.from_string("ipc://a-valid-path")
+        self.assertEqual(cfg.host, "a-valid-path")
+
+    def test_worker_names_config_value(self):
+        """Test the WorkerNames ConfigType class."""
+        wn = WorkerNames.from_string(" worker1 , worker2 ")
+        self.assertEqual(wn.names, ["worker1", "worker2"])
+        self.assertEqual(str(wn), "worker1,worker2")
+        self.assertEqual(len(wn), 2)
+        wn_empty = WorkerNames.from_string("")
+        self.assertEqual(wn_empty.names, [])
+
+    def test_worker_capabilities_config_value(self):
+        """Test the WorkerCapabilities ConfigType class."""
+        wc = WorkerCapabilities.from_string(" gpu=2, linux ")
+        self.assertEqual(wc.capabilities, {"gpu": 2, "linux": -1})
+        self.assertIn("gpu=2", str(wc))
+        self.assertIn("linux", str(wc))
+
+    def test_worker_capabilities_invalid_input(self):
+        """Test that WorkerCapabilities raises an error for non-integer values."""
+        with self.assertRaises(ValueError):
+            WorkerCapabilities.from_string("gpu=two")
+
+    def test_worker_capabilities_invalid_value_in_string(self):
+        """Test that WorkerCapabilities.from_string raises a helpful ValueError for non-integer values."""
+        with self.assertRaisesRegex(ValueError, "Expected an integer, but got 'MostPowerful'"):
+            WorkerCapabilities.from_string("linux,cpu=MostPowerful")
+
+
+if __name__ == "__main__":
+    unittest.main()

opengris_scaler-1.12.7/tests/test_config.py → opengris_scaler-1.12.9/tests/test_scheduler_config.py

@@ -3,58 +3,13 @@ import tempfile
 import unittest
 from argparse import Namespace
 
-from scaler.config.section.cluster import ClusterConfig
+from scaler.config import defaults
 from scaler.config.loader import load_config
 from scaler.config.section.scheduler import SchedulerConfig
 from scaler.config.types.object_storage_server import ObjectStorageConfig
-from scaler.config.types.worker import WorkerCapabilities, WorkerNames
-from scaler.config.types.zmq import ZMQConfig
-from scaler.config import defaults
 from scaler.scheduler.allocate_policy.allocate_policy import AllocatePolicy
 
 
-class TestConfigTypes(unittest.TestCase):
-    """Tests for individual ConfigType helper classes."""
-
-    def test_zmq_config_validation(self):
-        """Test ZMQConfig.from_string raises ValueError for malformed strings."""
-        with self.assertRaises(ValueError):
-            ZMQConfig.from_string("this-is-not-a-valid-address")
-        with self.assertRaises(ValueError):
-            ZMQConfig.from_string("tcp://127.0.0.1")
-        with self.assertRaises(ValueError):
-            ZMQConfig.from_string("badprotocol://127.0.0.1:1234")
-
-        cfg = ZMQConfig.from_string("ipc://a-valid-path")
-        self.assertEqual(cfg.host, "a-valid-path")
-
-    def test_worker_names_config_value(self):
-        """Test the WorkerNames ConfigType class."""
-        wn = WorkerNames.from_string(" worker1 , worker2 ")
-        self.assertEqual(wn.names, ["worker1", "worker2"])
-        self.assertEqual(str(wn), "worker1,worker2")
-        self.assertEqual(len(wn), 2)
-        wn_empty = WorkerNames.from_string("")
-        self.assertEqual(wn_empty.names, [])
-
-    def test_worker_capabilities_config_value(self):
-        """Test the WorkerCapabilities ConfigType class."""
-        wc = WorkerCapabilities.from_string(" gpu=2, linux ")
-        self.assertEqual(wc.capabilities, {"gpu": 2, "linux": -1})
-        self.assertIn("gpu=2", str(wc))
-        self.assertIn("linux", str(wc))
-
-    def test_worker_capabilities_invalid_input(self):
-        """Test that WorkerCapabilities raises an error for non-integer values."""
-        with self.assertRaises(ValueError):
-            WorkerCapabilities.from_string("gpu=two")
-
-    def test_worker_capabilities_invalid_value_in_string(self):
-        """Test that WorkerCapabilities.from_string raises a helpful ValueError for non-integer values."""
-        with self.assertRaisesRegex(ValueError, "Expected an integer, but got 'MostPowerful'"):
-            WorkerCapabilities.from_string("linux,cpu=MostPowerful")
-
-
 class TestSchedulerConfig(unittest.TestCase):
     """Tests for the SchedulerConfig class."""
 
@@ -136,44 +91,5 @@ allocate_policy = "even"
         self.assertEqual(config.logging_paths, ("/var/log/scaler.log", "/dev/stdout"))
 
 
-class TestClusterConfig(unittest.TestCase):
-    """Tests for the ClusterConfig class."""
-
-    def setUp(self):
-        self.temp_dir = tempfile.TemporaryDirectory()
-        self.config_path = os.path.join(self.temp_dir.name, "cluster.toml")
-        with open(self.config_path, "w") as f:
-            f.write(
-                """
-scheduler_address = "tcp://127.0.0.1:5555"
-# FIX: Changed num_of_workers to match the number of worker_names
-num_of_workers = 2
-worker_names = "w1,w2"
-"""
-            )
-
-    def tearDown(self):
-        self.temp_dir.cleanup()
-
-    def test_load_from_toml_only(self):
-        """Test loading ClusterConfig from a flat TOML file."""
-        config = load_config(ClusterConfig, self.config_path, Namespace())
-        self.assertEqual(str(config.scheduler_address), "tcp://127.0.0.1:5555")
-        self.assertEqual(config.num_of_workers, 2)
-        self.assertEqual(config.worker_names.names, ["w1", "w2"])
-
-    def test_command_line_overrides_toml(self):
-        """Test that argparse args correctly override TOML values for ClusterConfig."""
-        worker_list = [f"worker_{i}" for i in range(20)]
-        args = Namespace(num_of_workers=20, worker_names=",".join(worker_list), heartbeat_interval_seconds=99)
-
-        config = load_config(ClusterConfig, self.config_path, args)
-
-        self.assertEqual(config.num_of_workers, 20)
-        self.assertEqual(config.worker_names.names, worker_list)
-        self.assertEqual(config.heartbeat_interval_seconds, 99)
-        self.assertEqual(str(config.scheduler_address), "tcp://127.0.0.1:5555")
-
-
 if __name__ == "__main__":
     unittest.main()