Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions iotdb-core/ainode/iotdb/ainode/core/ai_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,11 @@ def stop(self):
self._rpc_handler.stop()
if self._rpc_service:
self._rpc_service.stop()
self._rpc_service.join(1)
if self._rpc_service.is_alive():
logger.warning("RPC service thread failed to stop in time.")
for retry in range(30):
self._rpc_service.join(2)
if not self._rpc_service.is_alive():
logger.warning(
"RPC service thread failed to stop in time, retrying..."
)
break
logger.info("IoTDB-AINode has successfully stopped.")
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ def get_load(self, model_id, device_id, pool_id) -> int:
return pool_group.get_load(pool_id)
return -1

def shutdown(self):
def stop(self):
self._stop_event.set()

# shutdown pool controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,9 @@ def inference(self, req: TInferenceReq):
single_output=False,
)

def shutdown(self):
def stop(self):
self._stop_event.set()
self._pool_controller.shutdown()
self._pool_controller.stop()
while not self._result_queue.empty():
self._result_queue.get_nowait()
self._result_queue.close()
2 changes: 1 addition & 1 deletion iotdb-core/ainode/iotdb/ainode/core/rpc/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, ainode):

def stop(self) -> None:
logger.info("Stopping the RPC service handler of IoTDB-AINode...")
self._inference_manager.shutdown()
self._inference_manager.stop()

def stopAINode(self) -> TSStatus:
self._ainode.stop()
Expand Down
1 change: 1 addition & 0 deletions iotdb-core/ainode/iotdb/ainode/core/rpc/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,4 @@ def stop(self) -> None:
logger.info("Stopping the RPC service of IoTDB-AINode...")
self._stop_event.set()
self.__pool_server.stop()
self._handler.stop()
17 changes: 13 additions & 4 deletions scripts/sbin/start-ainode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@ export IOTDB_AINODE_HOME
echo "IOTDB_AINODE_HOME: $IOTDB_AINODE_HOME"

# fetch parameters with names
while getopts "i:rn" opt; do
daemon_mode=false
while getopts "i:rnd" opt; do
case $opt in
n)
;;
d)
daemon_mode=true
;;
\?) echo "Invalid option -$OPTARG" >&2
exit 1
;;
Expand All @@ -41,6 +45,11 @@ ain_ainode_executable="$IOTDB_AINODE_HOME/lib/ainode"

echo Script got ainode executable: "$ain_ainode_executable"

echo Starting AINode...

$ain_ainode_executable start
if [ "$daemon_mode" = true ]; then
echo Starting AINode in daemon mode...
nohup $ain_ainode_executable start > /dev/null 2>&1 &
echo AINode started in background
else
echo Starting AINode...
$ain_ainode_executable start
fi
22 changes: 17 additions & 5 deletions scripts/sbin/windows/start-ainode.bat
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,20 @@ set ain_ainode_executable=%IOTDB_AINODE_HOME%\lib\ainode

echo Script got ainode executable: %ain_ainode_executable%

echo Starting AINode...

%$ain_ainode_executable% start

pause
set daemon_mode=false
:parse_args
if "%~1"=="" goto end_parse
if /i "%~1"=="-d" set daemon_mode=true
shift
goto parse_args
:end_parse

if "%daemon_mode%"=="true" (
echo Starting AINode in daemon mode...
start /B "" %ain_ainode_executable% start
echo AINode started in background
) else (
echo Starting AINode...
%ain_ainode_executable% start
pause
)
Loading