From f33f341c64ca42905712b98446123a0cef87f80b Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:09:19 +0000 Subject: [PATCH 01/12] update src/libruntime/fsclient/fs_intf.h. Signed-off-by: mayuehit --- src/libruntime/fsclient/fs_intf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libruntime/fsclient/fs_intf.h b/src/libruntime/fsclient/fs_intf.h index 36dc92a..3f8033a 100644 --- a/src/libruntime/fsclient/fs_intf.h +++ b/src/libruntime/fsclient/fs_intf.h @@ -83,7 +83,7 @@ using SubscriptionPayload = ::core_service::SubscriptionPayload; using NotificationPayload = ::core_service::NotificationPayload; using InstanceTermination = ::core_service::InstanceTermination; using FunctionMasterObserve = ::core_service::FunctionMasterObserve; -using KillCallBack = std::function; +using KillCallBack = std::function; using ExitRequest = ::core_service::ExitRequest; using ExitResponse = ::core_service::ExitResponse; -- Gitee From 8451f8af82f2206b671ae0d2d99a5a38e57669df Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:14:36 +0000 Subject: [PATCH 02/12] update src/libruntime/fsclient/fs_intf_impl.cpp. Signed-off-by: mayuehit --- src/libruntime/fsclient/fs_intf_impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libruntime/fsclient/fs_intf_impl.cpp b/src/libruntime/fsclient/fs_intf_impl.cpp index 13e4575..856d35c 100644 --- a/src/libruntime/fsclient/fs_intf_impl.cpp +++ b/src/libruntime/fsclient/fs_intf_impl.cpp @@ -540,7 +540,7 @@ void FSIntfImpl::KillAsync(const KillRequest &req, KillCallBack callback, int ti std::function needEraseWiredReq) { YRLOG_DEBUG("Receive kill response, request ID:{}", reqId); if (status.OK() && killResp.has_killrsp()) { - callback(killResp.killrsp()); + callback(killResp.killrsp(), ErrorInfo()); needEraseWiredReq(true); return; } @@ -550,7 +550,7 @@ void FSIntfImpl::KillAsync(const KillRequest &req, KillCallBack callback, int ti resp.set_message(status.Msg()); YRLOG_DEBUG("Receive kill response, request ID:{}, error code: {}, error message: {}", reqId, status.Code(), status.Msg()); - callback(resp); + callback(resp, status); needEraseWiredReq(true); return; }; @@ -575,10 +575,10 @@ void FSIntfImpl::KillAsync(const KillRequest &req, KillCallBack callback, int ti YRLOG_ERROR("Request timeout, start exec notify callback, request ID : {}", reqId); StreamingMessage fake; if (wiredReq->callback != nullptr) { - wiredReq->callback(fake, - ErrorInfo(ErrorCode::ERR_INNER_SYSTEM_ERROR, ModuleCode::CORE, - "kill request timeout, requestId: " + reqId), - [](bool needEraseWiredReq) {}); + auto timeoutErr = ErrorInfo(ErrorCode::ERR_INNER_SYSTEM_ERROR, ModuleCode::CORE, + "kill request timeout, requestId: " + reqId); + timeoutErr.SetIsTimeout(true); + wiredReq->callback(fake, timeoutErr, [](bool needEraseWiredReq) {}); } EraseWiredRequest(reqId); } -- Gitee From 9b2ea9ae4a13622ce0b6d765594b12026859f4fe Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:15:32 +0000 Subject: [PATCH 03/12] update src/libruntime/groupmanager/function_group.cpp. Signed-off-by: mayuehit --- src/libruntime/groupmanager/function_group.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libruntime/groupmanager/function_group.cpp b/src/libruntime/groupmanager/function_group.cpp index b0c27df..d4cc4c0 100644 --- a/src/libruntime/groupmanager/function_group.cpp +++ b/src/libruntime/groupmanager/function_group.cpp @@ -217,7 +217,7 @@ ErrorInfo FunctionGroup::Accelerate(const AccelerateMsgQueueHandle &handle, Hand killReq.set_instanceid(instanceIdList[i]); killReq.set_payload(payload); killReq.set_signal(libruntime::Signal::Accelerate); - fsClient->KillAsync(killReq, [killPromise](KillResponse rsp) { killPromise->set_value(rsp); }); + fsClient->KillAsync(killReq, [killPromise](KillResponse rsp, ErrorInfo err) { killPromise->set_value(rsp); }); } std::vector handles; std::vector objIds; -- Gitee From 18d827259c485adef8cbef281daaa548e3371c67 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:16:41 +0000 Subject: [PATCH 04/12] update src/libruntime/groupmanager/group.cpp. Signed-off-by: mayuehit --- src/libruntime/groupmanager/group.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libruntime/groupmanager/group.cpp b/src/libruntime/groupmanager/group.cpp index 6595c5c..38dec4f 100644 --- a/src/libruntime/groupmanager/group.cpp +++ b/src/libruntime/groupmanager/group.cpp @@ -113,7 +113,7 @@ void Group::Terminate() killReq.set_instanceid(groupId); killReq.set_payload(""); killReq.set_signal(libruntime::Signal::KillGroupInstance); - this->fsClient->KillAsync(killReq, [](KillResponse resp) -> void { + this->fsClient->KillAsync(killReq, [](KillResponse resp, ErrorInfo err) -> void { YRLOG_ERROR("get termiate group ins response, resp code is {}, resp msg is {}", resp.code(), resp.message()); }); SetTerminateError(); -- Gitee From 9bd9e21831e87a454986c80c57b374dbf4913fc9 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:25:49 +0000 Subject: [PATCH 05/12] update src/libruntime/invokeadaptor/invoke_adaptor.cpp. Signed-off-by: mayuehit --- src/libruntime/invokeadaptor/invoke_adaptor.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libruntime/invokeadaptor/invoke_adaptor.cpp b/src/libruntime/invokeadaptor/invoke_adaptor.cpp index 687b9cf..b487da8 100644 --- a/src/libruntime/invokeadaptor/invoke_adaptor.cpp +++ b/src/libruntime/invokeadaptor/invoke_adaptor.cpp @@ -998,7 +998,7 @@ void InvokeAdaptor::KillRaw(std::shared_ptr reqRaw, RawCallback cb) { KillRequest req; req.ParseFromString(std::string(static_cast(reqRaw->MutableData()), reqRaw->GetSize())); - this->fsClient->KillAsync(req, [this, cb](const KillResponse &resp) -> void { + this->fsClient->KillAsync(req, [this, cb](const KillResponse &resp, ErrorInfo err) -> void { YRLOG_DEBUG("recieve kill raw response, code is {}", resp.code()); size_t size = resp.ByteSizeLong(); auto respRaw = std::make_shared(size); @@ -1348,7 +1348,7 @@ ErrorInfo InvokeAdaptor::Kill(const std::string &instanceId, const std::string & auto killPromise = std::make_shared>(); std::shared_future killFuture = killPromise->get_future().share(); - this->fsClient->KillAsync(killReq, [killPromise](KillResponse rsp) -> void { killPromise->set_value(rsp); }); + this->fsClient->KillAsync(killReq, [killPromise](KillResponse rsp, ErrorInfo err) -> void { killPromise->set_value(rsp); }); ErrorInfo errInfo; if (signal == libruntime::Signal::killInstanceSync) { errInfo = WaitAndCheckResp(killFuture, instanceId, NO_TIMEOUT); @@ -1366,7 +1366,7 @@ void InvokeAdaptor::KillAsync(const std::string &instanceId, const std::string & killReq.set_instanceid(instanceId); killReq.set_payload(payload); killReq.set_signal(signal); - this->fsClient->KillAsync(killReq, [killReq](KillResponse rsp) -> void { + this->fsClient->KillAsync(killReq, [killReq](KillResponse rsp, ErrorInfo err) -> void { if (rsp.code() != common::ERR_NONE) { YRLOG_WARN("kill request failed, ins id is {}, signal is {}, err code is {}, err msg is {}", killReq.instanceid(), killReq.signal(), rsp.code(), rsp.message()); @@ -1655,17 +1655,18 @@ std::pair InvokeAdaptor::GetInstance(co killReq.set_signal(libruntime::Signal::GetInstance); auto promise = std::promise>(); auto future = promise.get_future(); - this->fsClient->KillAsync(killReq, [&promise](const KillResponse &rsp) -> void { + this->fsClient->KillAsync(killReq, [&promise](const KillResponse &rsp, const ErrorInfo &err) -> void { if (rsp.code() != common::ERR_NONE) { YR::Libruntime::ErrorInfo errInfo(static_cast(rsp.code()), ModuleCode::RUNTIME, rsp.message()); + errInfo.SetIsTimeout(err.IsTimeout()); promise.set_value(std::make_pair(libruntime::FunctionMeta{}, errInfo)); } else { libruntime::FunctionMeta funcMeta; funcMeta.ParseFromString(rsp.message()); promise.set_value(std::make_pair(funcMeta, YR::Libruntime::ErrorInfo())); } - }); + }, timeoutSec); auto [funcMeta, errorInfo] = future.get(); YRLOG_DEBUG("get instance finished, err code is {}, err msg is {}, function meta is {}", errorInfo.Code(), errorInfo.Msg(), funcMeta.DebugString()); @@ -1727,7 +1728,7 @@ void InvokeAdaptor::Subscribe(const std::string &insId) killReq.set_payload(serializedPayload); auto weakThis = weak_from_this(); YRLOG_DEBUG("start send subscribe req of instance: {}", insId); - this->fsClient->KillAsync(killReq, [insId, weakThis](KillResponse rsp) -> void { + this->fsClient->KillAsync(killReq, [insId, weakThis](KillResponse rsp, ErrorInfo err) -> void { if (rsp.code() != common::ERR_NONE) { YRLOG_WARN("subcribe ins status failed, ins id is : {}, code is {}, msg is {},", insId, rsp.code(), rsp.message()); @@ -1792,7 +1793,7 @@ void InvokeAdaptor::SubscribeActiveMaster() killReq.set_payload(serializedPayload); auto weakThis = weak_from_this(); YRLOG_DEBUG("start send subscribe function master req of instance: {}", instanceId); - this->fsClient->KillAsync(killReq, [instanceId](KillResponse rsp) -> void { + this->fsClient->KillAsync(killReq, [instanceId](KillResponse rsp, ErrorInfo err) -> void { YRLOG_DEBUG("get subcribe function master response, ins id is : {}, code is {},", instanceId, rsp.code()); }); } -- Gitee From edd526c6d1a2f549995b7cdcd01014259f871e36 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:27:26 +0000 Subject: [PATCH 06/12] update src/libruntime/invokeadaptor/normal_instance_manager.cpp. Signed-off-by: mayuehit --- src/libruntime/invokeadaptor/normal_instance_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libruntime/invokeadaptor/normal_instance_manager.cpp b/src/libruntime/invokeadaptor/normal_instance_manager.cpp index d6951e6..fb3f7fd 100644 --- a/src/libruntime/invokeadaptor/normal_instance_manager.cpp +++ b/src/libruntime/invokeadaptor/normal_instance_manager.cpp @@ -32,7 +32,7 @@ void NormalInsManager::SendKillReq(const std::string &insId) killReq.set_payload(""); killReq.set_signal(libruntime::Signal::KillInstance); YRLOG_DEBUG("start send kill req, ins id is {}", insId); - this->fsClient->KillAsync(killReq, [insId](KillResponse rsp) -> void { + this->fsClient->KillAsync(killReq, [insId](KillResponse rsp, ErrorInfo err) -> void { if (rsp.code() != common::ERR_NONE) { YRLOG_WARN("kill req send failed, instance id is {}", insId); } -- Gitee From d4a5e09500b14b8e7127bcd018a8e6b5a1f1aaf8 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:28:35 +0000 Subject: [PATCH 07/12] update test/libruntime/fs_client_test.cpp. Signed-off-by: mayuehit --- test/libruntime/fs_client_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/libruntime/fs_client_test.cpp b/test/libruntime/fs_client_test.cpp index d1da7f9..83997e5 100644 --- a/test/libruntime/fs_client_test.cpp +++ b/test/libruntime/fs_client_test.cpp @@ -311,7 +311,7 @@ TEST_F(FSClientGrpcTest, GrpcClientTest_KillAsync) DoStartGrpcClient(); NotificationUtility notify; - auto cb = [¬ify](const KillResponse &req) -> void { notify.Notify(); }; + auto cb = [¬ify](const KillResponse &req, ErrorInfo err) -> void { notify.Notify(); }; KillRequest req; fsClient_->KillAsync(req, cb, -1); @@ -333,7 +333,7 @@ TEST_F(FSClientGrpcTest, GrpcClientTest_KillAsyncTimeout) DoStartGrpcClient(); NotificationUtility notify; - auto cb = [¬ify](const KillResponse &req) -> void { + auto cb = [¬ify](const KillResponse &req, ErrorInfo e) -> void { auto err = ErrorInfo(static_cast(req.code()), req.message()); notify.Notify(err); }; @@ -681,7 +681,7 @@ TEST_F(FSClientGrpcTest, ReconnectTest) grpcServer = std::make_shared(Config::Instance().HOST_IP()); grpcServer->StartWithPort(port); NotificationUtility notify; - auto cb = [¬ify](const KillResponse &req) -> void { notify.Notify(); }; + auto cb = [¬ify](const KillResponse &req, ErrorInfo err) -> void { notify.Notify(); }; KillRequest req; fsClient_->KillAsync(req, cb, -1); -- Gitee From 3726480a5f4692248b9fa27a2ebe150089bd1ea4 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:29:22 +0000 Subject: [PATCH 08/12] update test/libruntime/libruntime_test.cpp. Signed-off-by: mayuehit --- test/libruntime/libruntime_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libruntime/libruntime_test.cpp b/test/libruntime/libruntime_test.cpp index 108d028..3e8c318 100644 --- a/test/libruntime/libruntime_test.cpp +++ b/test/libruntime/libruntime_test.cpp @@ -1132,7 +1132,7 @@ TEST_F(LibruntimeTest, DISABLED_resourcegroupTest) if (cb != nullptr) { YR::Libruntime::KillResponse resp; resp.set_code(static_cast(1001)); - cb(resp); + cb(resp, ErrorInfo()); } }); std::vector> bundles1 = { -- Gitee From d3c9aee6cef0cba49742d183c3e39755e42e29ae Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:30:06 +0000 Subject: [PATCH 09/12] update test/libruntime/mock/mock_fs_intf_with_callback.h. Signed-off-by: mayuehit --- test/libruntime/mock/mock_fs_intf_with_callback.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libruntime/mock/mock_fs_intf_with_callback.h b/test/libruntime/mock/mock_fs_intf_with_callback.h index 665daa4..8a50792 100644 --- a/test/libruntime/mock/mock_fs_intf_with_callback.h +++ b/test/libruntime/mock/mock_fs_intf_with_callback.h @@ -153,7 +153,7 @@ public: } AccelerateMsgQueueHandle handler{.name = "name"}; resp.set_message(handler.ToJson()); - callback(resp); + callback(resp, ErrorInfo()); try { killCallbackPromise.set_value(1); } catch (const std::exception &e) { -- Gitee From 2333a65dae0441f16735c168aefb8ef245768e00 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:30:59 +0000 Subject: [PATCH 10/12] update test/st/java/build.sh. Signed-off-by: mayuehit --- test/st/java/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/st/java/build.sh b/test/st/java/build.sh index b2d9e7b..bd3a77f 100644 --- a/test/st/java/build.sh +++ b/test/st/java/build.sh @@ -45,10 +45,10 @@ done function install_sdk() { cd $SDK_DIR - jarfile=$(find ./ -name "yr-api-sdk-[0-9]*.jar" -print -quit) + jarfile=$(find ./ -name "yr-api-sdk-*.jar" -print -quit) echo "[INFO] --java st-- Installing java sdk from ${SDK_DIR}/${jarfile}" mvn -q install:install-file -Dfile=${jarfile} -DartifactId=yr-api-sdk -DgroupId=com.yuanrong \ - -Dversion=1.0.0 -Dpackaging=jar -DpomFile=./pom.xml + -Dversion=v0.0.1 -Dpackaging=jar -DpomFile=./pom.xml } function package() { -- Gitee From 7507d0d02abd3a2ac05928df26885fa828063444 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:31:19 +0000 Subject: [PATCH 11/12] update test/st/java/pom.xml. Signed-off-by: mayuehit --- test/st/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/st/java/pom.xml b/test/st/java/pom.xml index 03fdc36..e3a747e 100644 --- a/test/st/java/pom.xml +++ b/test/st/java/pom.xml @@ -16,7 +16,7 @@ com.yuanrong yr-api-sdk - 1.0.0 + v0.0.1 org.testng -- Gitee From 0fb08d9d7cfb62208333aa6f2eacec116c4bd815 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 31 Oct 2025 09:31:44 +0000 Subject: [PATCH 12/12] update test/st/test.sh. Signed-off-by: mayuehit --- test/st/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/st/test.sh b/test/st/test.sh index 4a4d522..52af16a 100644 --- a/test/st/test.sh +++ b/test/st/test.sh @@ -87,7 +87,7 @@ function install_python_pkg() { pip3.9 install pytest pip3.9 install requests pip3.9 uninstall -y yr - pip3.9 install $YUANRONG_DIR/runtime/sdk/python/yr-*cp39-cp39-linux_x86_64.whl + pip3.9 install $YUANRONG_DIR/runtime/sdk/python/yr_sdk-*cp39-cp39-linux_x86_64.whl } function common_check_st_result() { -- Gitee