-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BugFix] Fix client couldn't cancel forward query
Signed-off-by: stdpain <drfeng08@gmail.com>
- Loading branch information
Showing
8 changed files
with
272 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
fe/fe-core/src/main/java/com/starrocks/qe/ProxyContextManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Copyright 2021-present StarRocks, Inc. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.starrocks.qe; | ||
|
|
||
| import com.google.common.collect.Maps; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| // When a query is forwarded from the follower FE to the leader FE, this ConnectContext on the leader is | ||
| // not managed by the ConnectScheduler. These ConnectContexts are managed by the ProxyContextManager. | ||
| // We can find these ConnectContexts on the leader by hostname and connection id, and perform operations such as kill. | ||
| public class ProxyContextManager { | ||
| private final Map<String, Map<Integer, ConnectContext>> connectionMaps = Maps.newConcurrentMap(); | ||
|
|
||
| static ProxyContextManager instance = new ProxyContextManager(); | ||
|
|
||
| public static ProxyContextManager getInstance() { | ||
| return instance; | ||
| } | ||
|
|
||
| public ScopeGuard guard(String hostName, int connectionId, ConnectContext context, boolean set) { | ||
| return new ScopeGuard(this, hostName, connectionId, context, set); | ||
| } | ||
|
|
||
| public synchronized void addContext(String hostname, Integer connectionId, ConnectContext context) { | ||
| final Map<Integer, ConnectContext> contextMap = | ||
| connectionMaps.computeIfAbsent(hostname, (String host) -> Maps.newConcurrentMap()); | ||
| contextMap.put(connectionId, context); | ||
| contextMap.computeIfAbsent(connectionId, cid -> context); | ||
| } | ||
|
|
||
| public ConnectContext getContext(String hostname, Integer connectionId) { | ||
| final Map<Integer, ConnectContext> contextMap = connectionMaps.get(hostname); | ||
| if (contextMap == null) { | ||
| return null; | ||
| } | ||
| return contextMap.get(connectionId); | ||
| } | ||
|
|
||
| public ConnectContext getContextByQueryId(String queryId) { | ||
| return connectionMaps.values().stream().flatMap(item -> item.values().stream()).filter(ctx -> | ||
| ctx.getQueryId() != null && queryId.equals(ctx.getQueryId().toString())).findFirst().orElse(null); | ||
| } | ||
|
|
||
| public synchronized void remove(String hostname, Integer connectionId) { | ||
| final Map<Integer, ConnectContext> contextMap = connectionMaps.get(hostname); | ||
| if (contextMap != null) { | ||
| contextMap.remove(connectionId); | ||
| if (contextMap.isEmpty()) { | ||
| connectionMaps.remove(hostname); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static class ScopeGuard implements AutoCloseable { | ||
| private ProxyContextManager manager; | ||
| private boolean set = false; | ||
| private String hostName; | ||
| private int connectionId; | ||
|
|
||
| public ScopeGuard(ProxyContextManager manager, String hostName, int connectionId, ConnectContext context, | ||
| boolean set) { | ||
| if (set) { | ||
| this.manager = manager; | ||
| this.hostName = hostName; | ||
| this.connectionId = connectionId; | ||
| manager.addContext(hostName, connectionId, context); | ||
| } | ||
| this.set = set; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws Exception { | ||
| if (set) { | ||
| manager.remove(hostName, connectionId); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
fe/fe-core/src/test/java/com/starrocks/qe/ForwardTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Copyright 2021-present StarRocks, Inc. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.starrocks.qe; | ||
|
|
||
| import com.starrocks.common.util.UUIDUtil; | ||
| import com.starrocks.server.GlobalStateMgr; | ||
| import com.starrocks.service.ExecuteEnv; | ||
| import com.starrocks.service.FrontendServiceImpl; | ||
| import com.starrocks.thrift.TMasterOpRequest; | ||
| import com.starrocks.thrift.TMasterOpResult; | ||
| import com.starrocks.thrift.TNetworkAddress; | ||
| import com.starrocks.thrift.TUserIdentity; | ||
| import mockit.Mock; | ||
| import mockit.MockUp; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| public class ForwardTest { | ||
|
|
||
| TMasterOpRequest makeRequest() { | ||
| TMasterOpRequest request = new TMasterOpRequest(); | ||
| request.setCatalog("default"); | ||
| request.setCluster("default"); | ||
| request.setDb("information_schema"); | ||
| request.setQueryId(UUIDUtil.genTUniqueId()); | ||
| final TUserIdentity userIdentity = new TUserIdentity(); | ||
| request.setCurrent_user_ident(userIdentity); | ||
| return request; | ||
| } | ||
|
|
||
| @Test | ||
| public void testKillConnection() throws Exception { | ||
| final FrontendServiceImpl service = new FrontendServiceImpl(ExecuteEnv.getInstance()); | ||
| final TMasterOpRequest request = makeRequest(); | ||
| request.setConnectionId(1); | ||
| request.setSql("kill QUERY 1"); | ||
| new MockUp<GlobalStateMgr>() { | ||
| @Mock | ||
| public Long getMaxJournalId() { | ||
| return 1L; | ||
| } | ||
| }; | ||
| final TMasterOpResult result = service.forward(request); | ||
| Assert.assertEquals(result.errorMsg, ""); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUpgradeKillConnection() throws Exception { | ||
| final FrontendServiceImpl service = new FrontendServiceImpl(ExecuteEnv.getInstance()); | ||
| final TMasterOpRequest request = makeRequest(); | ||
| request.setSql("kill QUERY 1"); | ||
| new MockUp<GlobalStateMgr>() { | ||
| @Mock | ||
| public Long getMaxJournalId() { | ||
| return 1L; | ||
| } | ||
| }; | ||
| final TMasterOpResult result = service.forward(request); | ||
| Assert.assertEquals(result.errorMsg, "Unknown thread id: 1"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testKillWithUnknownException() throws Exception { | ||
| final FrontendServiceImpl service = new FrontendServiceImpl(ExecuteEnv.getInstance()); | ||
| final TMasterOpRequest request = makeRequest(); | ||
| request.setSql("kill QUERY 1"); | ||
| request.setConnectionId(1); | ||
|
|
||
| new MockUp<GlobalStateMgr>() { | ||
| @Mock | ||
| public Long getMaxJournalId() { | ||
| return 1L; | ||
| } | ||
| }; | ||
| new MockUp<FrontendServiceImpl>() { | ||
| @Mock | ||
| public TNetworkAddress getClientAddr() { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| new MockUp<ConnectProcessor>() { | ||
| @Mock | ||
| public TMasterOpResult proxyExecute(TMasterOpRequest request) { | ||
| throw new RuntimeException("unknown exception"); | ||
| } | ||
| }; | ||
|
|
||
| final TMasterOpResult result = service.forward(request); | ||
| Assert.assertEquals(result.errorMsg, "unknown exception"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters