From f7c04a359ed74a618ac51225aabff25a3bc31a4d Mon Sep 17 00:00:00 2001 From: getee0506 Date: Thu, 5 Jun 2025 19:25:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E6=94=AF=E6=8C=81=E4=B8=BB=E5=8A=A8=E5=80=9F?= =?UTF-8?q?=E8=BD=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toolkit/recover_module/pb/recover_pb2.py | 18 +- .../recover_module/pb/recover_pb2_grpc.py | 185 ++++-------------- 2 files changed, 41 insertions(+), 162 deletions(-) diff --git a/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2.py b/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2.py index 2f4f4cb57..b69dd0e76 100644 --- a/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2.py +++ b/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: recover.proto -# Protobuf Python Version: 5.29.0 +# Protobuf Python Version: 4.25.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 0, - '', - 'recover.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -29,10 +19,10 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\rrecover.proto\"$ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'recover_pb2', _globals) -if not _descriptor._USE_C_DESCRIPTORS: - _globals['DESCRIPTOR']._loaded_options = None +if _descriptor._USE_C_DESCRIPTORS == False: + _globals['DESCRIPTOR']._options = None _globals['DESCRIPTOR']._serialized_options = b'Z\004.;pb' - _globals['_SWITCHNICS_NICOPSENTRY']._loaded_options = None + _globals['_SWITCHNICS_NICOPSENTRY']._options = None _globals['_SWITCHNICS_NICOPSENTRY']._serialized_options = b'8\001' _globals['_STATUS']._serialized_start=17 _globals['_STATUS']._serialized_end=53 diff --git a/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2_grpc.py b/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2_grpc.py index abc85fe76..adb9bc015 100644 --- a/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2_grpc.py +++ b/component/taskd/taskd/python/toolkit/recover_module/pb/recover_pb2_grpc.py @@ -1,28 +1,8 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc -import warnings -from . import recover_pb2 as recover__pb2 - -GRPC_GENERATED_VERSION = '1.71.0' -GRPC_VERSION = grpc.__version__ -_version_not_supported = False - -try: - from grpc._utilities import first_version_is_lower - _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) -except ImportError: - _version_not_supported = True - -if _version_not_supported: - raise RuntimeError( - f'The grpc package installed is at version {GRPC_VERSION},' - + f' but the generated code in recover_pb2_grpc.py depends on' - + f' grpcio>={GRPC_GENERATED_VERSION}.' - + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' - + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' - ) +import recover_pb2 as recover__pb2 class RecoverStub(object): @@ -38,47 +18,47 @@ class RecoverStub(object): '/Recover/Init', request_serializer=recover__pb2.ClientInfo.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.Register = channel.unary_unary( '/Recover/Register', request_serializer=recover__pb2.ClientInfo.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.SubscribeProcessManageSignal = channel.unary_stream( '/Recover/SubscribeProcessManageSignal', request_serializer=recover__pb2.ClientInfo.SerializeToString, response_deserializer=recover__pb2.ProcessManageSignal.FromString, - _registered_method=True) + ) self.ReportStopComplete = channel.unary_unary( '/Recover/ReportStopComplete', request_serializer=recover__pb2.StopCompleteRequest.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.ReportRecoverStrategy = channel.unary_unary( '/Recover/ReportRecoverStrategy', request_serializer=recover__pb2.RecoverStrategyRequest.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.ReportRecoverStatus = channel.unary_unary( '/Recover/ReportRecoverStatus', request_serializer=recover__pb2.RecoverStatusRequest.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.ReportProcessFault = channel.unary_unary( '/Recover/ReportProcessFault', request_serializer=recover__pb2.ProcessFaultRequest.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.SwitchNicTrack = channel.unary_unary( '/Recover/SwitchNicTrack', request_serializer=recover__pb2.SwitchNics.SerializeToString, response_deserializer=recover__pb2.Status.FromString, - _registered_method=True) + ) self.SubscribeSwitchNicSignal = channel.unary_stream( '/Recover/SubscribeSwitchNicSignal', request_serializer=recover__pb2.SwitchNicRequest.SerializeToString, response_deserializer=recover__pb2.SwitchNicResponse.FromString, - _registered_method=True) + ) class RecoverServicer(object): @@ -190,7 +170,6 @@ def add_RecoverServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'Recover', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) - server.add_registered_method_handlers('Recover', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -208,21 +187,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/Init', + return grpc.experimental.unary_unary(request, target, '/Recover/Init', recover__pb2.ClientInfo.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def Register(request, @@ -235,21 +204,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/Register', + return grpc.experimental.unary_unary(request, target, '/Recover/Register', recover__pb2.ClientInfo.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def SubscribeProcessManageSignal(request, @@ -262,21 +221,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_stream( - request, - target, - '/Recover/SubscribeProcessManageSignal', + return grpc.experimental.unary_stream(request, target, '/Recover/SubscribeProcessManageSignal', recover__pb2.ClientInfo.SerializeToString, recover__pb2.ProcessManageSignal.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def ReportStopComplete(request, @@ -289,21 +238,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/ReportStopComplete', + return grpc.experimental.unary_unary(request, target, '/Recover/ReportStopComplete', recover__pb2.StopCompleteRequest.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def ReportRecoverStrategy(request, @@ -316,21 +255,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/ReportRecoverStrategy', + return grpc.experimental.unary_unary(request, target, '/Recover/ReportRecoverStrategy', recover__pb2.RecoverStrategyRequest.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def ReportRecoverStatus(request, @@ -343,21 +272,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/ReportRecoverStatus', + return grpc.experimental.unary_unary(request, target, '/Recover/ReportRecoverStatus', recover__pb2.RecoverStatusRequest.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def ReportProcessFault(request, @@ -370,21 +289,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/ReportProcessFault', + return grpc.experimental.unary_unary(request, target, '/Recover/ReportProcessFault', recover__pb2.ProcessFaultRequest.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def SwitchNicTrack(request, @@ -397,21 +306,11 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary( - request, - target, - '/Recover/SwitchNicTrack', + return grpc.experimental.unary_unary(request, target, '/Recover/SwitchNicTrack', recover__pb2.SwitchNics.SerializeToString, recover__pb2.Status.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod def SubscribeSwitchNicSignal(request, @@ -424,18 +323,8 @@ class Recover(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_stream( - request, - target, - '/Recover/SubscribeSwitchNicSignal', + return grpc.experimental.unary_stream(request, target, '/Recover/SubscribeSwitchNicSignal', recover__pb2.SwitchNicRequest.SerializeToString, recover__pb2.SwitchNicResponse.FromString, - options, - channel_credentials, - insecure, - call_credentials, - compression, - wait_for_ready, - timeout, - metadata, - _registered_method=True) + options, channel_credentials, + insecure, call_credentials, compression, wait_for_ready, timeout, metadata) -- Gitee From 83ff97a0c837e824b069cade17e0bfd96c1e5464 Mon Sep 17 00:00:00 2001 From: getee0506 Date: Thu, 5 Jun 2025 19:47:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E6=94=AF=E6=8C=81=E4=B8=BB=E5=8A=A8=E5=80=9F?= =?UTF-8?q?=E8=BD=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jobprocess/relationfault/relation_fault_processor.go | 1 + component/taskd/taskd/go/backend_api.go | 1 + 2 files changed, 2 insertions(+) diff --git a/component/clusterd/pkg/application/faultmanager/jobprocess/relationfault/relation_fault_processor.go b/component/clusterd/pkg/application/faultmanager/jobprocess/relationfault/relation_fault_processor.go index fb47d7dd4..e6df809d7 100644 --- a/component/clusterd/pkg/application/faultmanager/jobprocess/relationfault/relation_fault_processor.go +++ b/component/clusterd/pkg/application/faultmanager/jobprocess/relationfault/relation_fault_processor.go @@ -379,6 +379,7 @@ func (fJob *FaultJob) addFaultInfoByCodeType(faultInfo *constant.FaultInfo) { } fJob.TriggerFault = append(fJob.TriggerFault, *faultInfo) } + } func isAssociateFault(faultCode string) bool { diff --git a/component/taskd/taskd/go/backend_api.go b/component/taskd/taskd/go/backend_api.go index abb9475c2..f25a6f2ef 100644 --- a/component/taskd/taskd/go/backend_api.go +++ b/component/taskd/taskd/go/backend_api.go @@ -66,6 +66,7 @@ func InitWorker(globalRank, nodeRank, upperLimitOfDiskInMb int) C.int { hwlog.RunLog.Errorf("Received signal: %v, exiting...", sig) cancel() }() + err := utils.InitHwLog(fmt.Sprintf(constant.WorkerLogPathPattern, strconv.Itoa(globalRank)), ctx) if err != nil { fmt.Println(err) -- Gitee