Dev/task local sched cri preempt

CMakeLists.txt

@@ -341,6 +341,13 @@ else ()
     message(FATAL_ERROR "LibAIO was not found.")
 endif ()
 
+find_package(Subid REQUIRED)
+if (Subid_FOUND)
+    message(STATUS "Subid found. Include: ${SUBID_INCLUDE_DIRS}; Libs: ${SUBID_LIBRARIES}")
+else ()
+    message(FATAL_ERROR "Subid library was not found.")
+endif ()
+
 if (CRANE_ENABLE_BPF)
     find_package(BPF 1.4.6 REQUIRED)
 endif ()

CMakeModule/FindSubid.cmake

@@ -0,0 +1,53 @@
+# FindSubid.cmake
+# Exports:
+#   Subid_FOUND
+#   SUBID_INCLUDE_DIR
+#   SUBID_LIBRARY
+#   Subid::subid  (IMPORTED STATIC/SHARED)
+
+if (SUBID_INCLUDE_DIR AND SUBID_LIBRARY)
+  set(Subid_FIND_QUIETLY TRUE)
+endif()
+
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_SUBID QUIET libsubid)
+  if (PC_SUBID_FOUND)
+    set(SUBID_VERSION ${PC_SUBID_VERSION})
+  endif()
+endif()
+
+find_path(SUBID_INCLUDE_DIR
+  NAMES subid.h
+  HINTS ${PC_SUBID_INCLUDEDIR} ${PC_SUBID_INCLUDE_DIRS}
+  PATH_SUFFIXES shadow
+)
+
+find_library(SUBID_LIBRARY
+  NAMES subid
+  HINTS ${PC_SUBID_LIBDIR} ${PC_SUBID_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Subid
+  FOUND_VAR Subid_FOUND
+  REQUIRED_VARS SUBID_LIBRARY SUBID_INCLUDE_DIR
+  VERSION_VAR SUBID_VERSION
+)
+
+if (Subid_FOUND AND NOT TARGET Subid::subid)
+  get_filename_component(_ext "${SUBID_LIBRARY}" EXT)
+  if (_ext STREQUAL ".a")
+    set(_kind STATIC)
+  else()
+    set(_kind SHARED)
+  endif()
+
+  add_library(Subid::subid ${_kind} IMPORTED GLOBAL)
+  set_target_properties(Subid::subid PROPERTIES
+    IMPORTED_LOCATION             "${SUBID_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${SUBID_INCLUDE_DIR}"
+  )
+endif()
+
+mark_as_advanced(SUBID_INCLUDE_DIR SUBID_LIBRARY SUBID_VERSION)

docs/deployment/backend/Ubuntu.md

@@ -104,8 +104,17 @@ The toolchain must meet the following version requirements:
 ### 2.1 Install Build Tools
 
 ```bash
-wget https://apt.llvm.org/llvm.sh
-bash ./llvm.sh 19
+apt install build-essential
+apt install libmpfr-dev libgmp3-dev libmpc-dev -y
+wget http://ftp.gnu.org/gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.gz
+tar -xf gcc-14.1.0.tar.gz
+cd gcc-14.1.0
+
+./contrib/download_prerequisites
+mkdir build && cd build
+../configure --enable-checking=release --enable-languages=c,c++ --disable-multilib
+make -j
+make install
 
 #For ubuntu 20.04
 wget https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.sh
@@ -159,25 +168,25 @@ cd CraneSched
 mkdir -p build && cd build
 
 # For CGroup v1
-cmake -G Ninja ..
+cmake -G Ninja .. -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ 
 cmake --build .
 
 # For CGroup v2
-cmake -G Ninja .. -DCRANE_ENABLE_CGROUP_V2=true
+cmake -G Ninja .. -DCRANE_ENABLE_CGROUP_V2=true -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ 
 cmake --build .
 ```
 
 2. Install the built binaries:
 
 !!! tip
     We recommend deploying CraneSched using DEB packages. See the [Packaging Guide](packaging.md) for installation instructions.
+
 ```bash
 cmake --install .
 ```
 
 For deploying CraneSched to multiple nodes, please follow the [Multi-node Deployment Guide](../configuration/multi-node.md).
 
-
 ### 5.2 Configure PAM Module
 
 PAM module configuration is optional but recommended for production clusters to control user access.

docs/deployment/backend/packaging.md

@@ -144,24 +144,50 @@ sudo dpkg -i CraneSched-*-craned.deb
 Contains files for the control node:
 
 ```
-/usr/local/bin/cranectld                    # Control daemon binary
-/etc/systemd/system/cranectld.service       # Systemd service file
+/usr/bin/cranectld                          # Control daemon binary
+/usr/lib/systemd/system/cranectld.service   # Systemd service file
 /etc/crane/config.yaml.sample               # Cluster configuration template
 /etc/crane/database.yaml.sample             # Database configuration template
 ```
 
+!!! warning "Installation Path Differences"
+    The file paths differ depending on the installation method:
+
+    **When using RPM/DEB packages (`cpack`):**
+    - Binaries are installed to `/usr/bin/` (following FHS standard)
+    - Example: `/usr/bin/cranectld`
+
+    **When using direct installation (`cmake --install`):**
+    - Binaries are installed to `/usr/local/bin/` (default `CMAKE_INSTALL_PREFIX`)
+    - Example: `/usr/local/bin/cranectld`
+    - You can customize this with `cmake --install --prefix=/custom/path`
+
 ### craned Package
 
 Contains files for compute nodes:
 
 ```
-/usr/local/bin/craned                       # Execution daemon binary
+/usr/bin/craned                             # Execution daemon binary
 /usr/libexec/csupervisor                    # Per-step execution supervisor
-/etc/systemd/system/craned.service          # Systemd service file
+/usr/lib/systemd/system/craned.service      # Systemd service file
 /etc/crane/config.yaml.sample               # Cluster configuration template
 /usr/lib64/security/pam_crane.so            # PAM authentication module
 ```
 
+!!! warning "Installation Path Differences"
+    The file paths differ depending on the installation method:
+
+    **When using RPM/DEB packages (`cpack`):**
+    - Binaries are installed to `/usr/bin/` (following FHS standard)
+    - Supervisor is installed to `/usr/libexec/`
+    - Examples: `/usr/bin/craned`, `/usr/libexec/csupervisor`
+
+    **When using direct installation (`cmake --install`):**
+    - Binaries are installed to `/usr/local/bin/` (default `CMAKE_INSTALL_PREFIX`)
+    - Supervisor is installed to `/usr/local/libexec/`
+    - Examples: `/usr/local/bin/craned`, `/usr/local/libexec/csupervisor`
+    - You can customize this with `cmake --install --prefix=/custom/path`
+
 ### Post-Installation Actions
 
 Both packages include a post-installation script that automatically:

etc/config.yaml

@@ -35,6 +35,8 @@ CraneCtldLogFile: cranectld/cranectld.log
 CraneCtldMutexFilePath: cranectld/cranectld.lock
 # whether the cranectld is running in the background
 CraneCtldForeground: true
+# whether to bind cpu to cores for job
+BindCpu: true
 CraneCtld:
   # ping timeout in seconds
   CranedTimeout: 30
@@ -153,14 +155,10 @@ Container:
   # Toggle the container support in CraneSched
   Enabled: false
   # Relate to CraneBaseDir
-  TempDir: craned/containers/
-  # OCI Runtime must support `state`, `kill`, `delete`, `run` subcommands
-  # %b, %u, %U, %j, %x will be replaced by bundle_path, user, uid, job_id, job_name
-  RuntimeBin: /usr/bin/runc
-  RuntimeState: /usr/bin/runc --root=/run/user/%U/ state %u.%U.%j.%x
-  RuntimeKill: /usr/bin/runc --rootless=true --root=/run/user/%U/ kill -a %u.%U.%j.%x SIGTERM
-  RuntimeDelete: /usr/bin/runc --rootless=true --root=/run/user/%U/ delete --force %u.%U.%j.%x
-  RuntimeRun: /usr/bin/runc --rootless=true --root=/run/user/%U/ run -b %b %u.%U.%j.%x
+  TempDir: supervisor/containers/
+  # In most cases, ImageEndpoint is the same as RuntimeEndpoint
+  RuntimeEndpoint: /run/containerd/containerd.sock
+  ImageEndpoint: /run/containerd/containerd.sock
 
 Plugin:
   # Toggle the plugin module in CraneSched
@@ -171,9 +169,15 @@ Plugin:
   PlugindDebugLevel: "trace"
   # the address of Plugind to listen
   PlugindListenAddress: 127.0.0.1
-  PlugindListenPort: 10018  
+  PlugindListenPort: 10018
   # Plugins to be loaded in Plugind
   Plugins:
     - Name: "dummy"
       Path: "/path/to/dummy.so"
       Config: "/path/to/dummy.yaml"
+
+Preempt:
+  # PreemptType can be none, qos, partition
+  PreemptType: none
+  # PreemptMode can be OFF, CANCEL, REQUEUE, SUSPEND
+  PreemptMode: OFF

etc/cranectld.service.in

@@ -5,7 +5,7 @@ After=network.target nss-lookup.target
 [Service]
 User=crane
 Group=crane
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/cranectld
+ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/cranectld
 
 [Install]
 WantedBy=multi-user.target

etc/craned.service.in

@@ -5,7 +5,7 @@ After=network.target nss-lookup.target
 [Service]
 User=root
 Group=root
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/craned
+ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/craned
 
 [Install]
 WantedBy=multi-user.target

protos/CMakeLists.txt

@@ -1,15 +1,16 @@
 # Generate proto files
-set(proto_src PublicDefs.proto Crane.proto Supervisor.proto Plugin.proto)
 set(GENERATED_FILE_PATH ${CMAKE_SOURCE_DIR}/generated)
 file(MAKE_DIRECTORY ${GENERATED_FILE_PATH})
 
 include(${CMAKE_SOURCE_DIR}/CMakeModule/ProtobufGenerate.cmake)
+
+set(proto_src PublicDefs.proto Crane.proto Supervisor.proto Plugin.proto)
 PROTOBUF_GENERATE_GRPC_CPP(ProtoCxxSources ProtoCxxHeaders ${GENERATED_FILE_PATH}/protos
         ${protobuf_SOURCE_DIR}/src ${proto_src})
 
 get_property(protobuf_SOURCE_DIR GLOBAL PROPERTY protobuf_SOURCE_DIR)
+
 message(STATUS "Generated proto: ${ProtoCxxSources} ${ProtoCxxHeaders}")
-message(STATUS "_PROTOBUF_PROTOC: ${_PROTOBUF_PROTOC};protobuf_SOURCE_DIR: ${protobuf_SOURCE_DIR}")
 
 add_library(crane_proto_lib STATIC
         ${ProtoCxxSources} ${ProtoCxxHeaders})
@@ -21,4 +22,7 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/generated/*")
 
 target_link_libraries(crane_proto_lib absl::base absl::synchronization)
-set_property(TARGET crane_proto_lib PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET crane_proto_lib PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+# Add CRI proto subdirectory
+add_subdirectory(cri)