[ISSUE #1553]🔥Optimize rocketmq-namesrv crate DefaultRequestProcessor…

… error handle⚡️ (#1561)
mxsm · Dec 5, 2024 · 1892a08 · 1892a08
1 parent f80f3a8
commit 1892a08
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/rocketmq-namesrv/src/processor.rs b/rocketmq-namesrv/src/processor.rs
@@ -47,17 +47,16 @@ impl RequestProcessor for NameServerRequestProcessor {
     ) -> Result<Option<RemotingCommand>> {
         let request_code = RequestCode::from(request.code());
         info!("Name server Received request code: {:?}", request_code);
-        match request_code {
-            RequestCode::GetRouteinfoByTopic => self
-                .client_request_processor
-                .process_request(channel, ctx, request_code, request)
-                .map_err(Into::into),
-            _ => Ok(self.default_request_processor.process_request(
-                channel,
-                ctx,
-                request_code,
-                request,
-            )),
-        }
+        let result = match request_code {
+            RequestCode::GetRouteinfoByTopic => {
+                self.client_request_processor
+                    .process_request(channel, ctx, request_code, request)
+            }
+            _ => {
+                self.default_request_processor
+                    .process_request(channel, ctx, request_code, request)
+            }
+        };
+        result.map_err(Into::into)
     }
 }
diff --git a/rocketmq-namesrv/src/processor/default_request_processor.rs b/rocketmq-namesrv/src/processor/default_request_processor.rs
@@ -75,7 +75,7 @@ impl DefaultRequestProcessor {
         _ctx: ConnectionHandlerContext,
         request_code: RequestCode,
         request: RemotingCommand,
-    ) -> Option<RemotingCommand> {
+    ) -> crate::Result<Option<RemotingCommand>> {
         let response = match request_code {
             RequestCode::PutKvConfig => self.put_kv_config(request),
             RequestCode::GetKvConfig => self.get_kv_config(request),
@@ -111,7 +111,7 @@ impl DefaultRequestProcessor {
                 RemotingSysResponseCode::SystemError,
             ),
         };
-        Some(response)
+        Ok(Some(response))
     }
 }