Skip to content

Commit 0f23a4d

Browse files
author
caiconghui1
committed
fix style
1 parent c781286 commit 0f23a4d

File tree

7 files changed

+14
-16
lines changed

7 files changed

+14
-16
lines changed

fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,11 @@ public static List<Backend> checkDecommission(List<Triple<String, String, Intege
193193
List<Backend> decommissionBackends = Lists.newArrayList();
194194
// check if exist
195195
for (Triple<String, String, Integer> triple : ipHostPortTriples) {
196-
Backend backend = infoService.getBackendWithHeartbeatPort(triple.getLeft(), triple.getMiddle(), triple.getRight());
196+
Backend backend = infoService.getBackendWithHeartbeatPort(
197+
triple.getLeft(), triple.getMiddle(), triple.getRight());
197198
if (backend == null) {
198-
throw new DdlException("Backend does not exist[" + (triple.getMiddle() == null ? triple.getLeft() : triple.getMiddle())
199-
+ ":" + triple.getRight() + "]");
199+
throw new DdlException("Backend does not exist[" + (triple.getMiddle() == null ?
200+
triple.getLeft() : triple.getMiddle()) + ":" + triple.getRight() + "]");
200201
}
201202
if (backend.isDecommissioned()) {
202203
// already under decommission, ignore it
@@ -217,8 +218,8 @@ public synchronized void cancel(CancelStmt stmt) throws DdlException {
217218
SystemInfoService infoService = Catalog.getCurrentSystemInfo();
218219
// check if backends is under decommission
219220
List<Backend> backends = Lists.newArrayList();
220-
List<Triple<String, String, Integer>> hostPortTriples = cancelAlterSystemStmt.getIpHostPortTriples();
221-
for (Triple<String, String, Integer> triple : hostPortTriples) {
221+
List<Triple<String, String, Integer>> ipHostPortTriples = cancelAlterSystemStmt.getIpHostPortTriples();
222+
for (Triple<String, String, Integer> triple : ipHostPortTriples) {
222223
// check if exist
223224
Backend backend = infoService.getBackendWithHeartbeatPort(triple.getLeft(), triple.getMiddle(), triple.getRight());
224225
if (backend == null) {
@@ -227,7 +228,6 @@ public synchronized void cancel(CancelStmt stmt) throws DdlException {
227228
}
228229

229230
if (!backend.isDecommissioned()) {
230-
// it's ok. just log
231231
LOG.info("backend is not decommissioned[{}]",
232232
triple.getMiddle() == null ? triple.getLeft() : triple.getMiddle());
233233
continue;

fe/fe-core/src/main/java/org/apache/doris/analysis/AddBackendClause.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717

1818
package org.apache.doris.analysis;
1919

20-
2120
import org.apache.doris.common.AnalysisException;
2221
import org.apache.doris.common.util.PropertyAnalyzer;
2322
import org.apache.doris.resource.Tag;
2423

2524
import com.google.common.base.Strings;
2625
import com.google.common.collect.Maps;
2726

28-
2927
import java.util.List;
3028
import java.util.Map;
3129

fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,6 @@ private void startMasterOnlyDaemonThreads() {
13601360
// start daemon thread to update global partition in memory information periodically
13611361
partitionInMemoryInfoCollector.start();
13621362
streamLoadRecordMgr.start();
1363-
13641363
getInternalDataSource().getIcebergTableCreationRecordMgr().start();
13651364
if (Config.enable_k8s_detect_container_drift_mode) {
13661365
FQDNManager.start();

fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected void initEnvVariables(String envElectableFeServiceGroup, String envObs
156156
this.brokerServiceGroup = Strings.nullToEmpty(System.getenv(envBrokerServiceGroup));
157157

158158
LOG.info("get deploy env: {}, {}, {}, {}", envElectableFeServiceGroup, envObserverFeServiceGroup,
159-
envBackendServiceGroup, envBrokerServiceGroup);
159+
envBackendServiceGroup, envBrokerServiceGroup);
160160

161161
// electableFeServiceGroup and backendServiceGroup must exist
162162
if (Strings.isNullOrEmpty(electableFeServiceGroup) || Strings.isNullOrEmpty(backendServiceGroup)) {

fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public K8sDeployManager(Catalog catalog, long intervalMs) {
8282
protected void initEnvVariables(String envElectableFeServiceGroup, String envObserverFeServiceGroup,
8383
String envBackendServiceGroup, String envBrokerServiceGroup) {
8484
super.initEnvVariables(envElectableFeServiceGroup, envObserverFeServiceGroup, envBackendServiceGroup,
85-
envBrokerServiceGroup);
85+
envBrokerServiceGroup);
8686

8787
// namespace
8888
appNamespace = Strings.nullToEmpty(System.getenv(ENV_APP_NAMESPACE));
@@ -187,9 +187,9 @@ private synchronized KubernetesClient client() {
187187
if (Config.with_k8s_certs) {
188188
// for test only
189189
ConfigBuilder configBuilder = new ConfigBuilder().withMasterUrl(TEST_MASTER_URL)
190-
.withTrustCerts(true)
191-
.withCaCertFile(K8S_CA_CERT_FILE).withClientCertFile(K8S_CLIENT_CERT_FILE)
192-
.withClientKeyFile(K8S_CLIENT_KEY_FILE);
190+
.withTrustCerts(true)
191+
.withCaCertFile(K8S_CA_CERT_FILE).withClientCertFile(K8S_CLIENT_CERT_FILE)
192+
.withClientKeyFile(K8S_CLIENT_KEY_FILE);
193193
client = new DefaultKubernetesClient(configBuilder.build());
194194
} else {
195195
// When accessing k8s api within the pod, no params need to be provided.

fe/fe-core/src/main/java/org/apache/doris/deploy/impl/LocalFileDeployManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public LocalFileDeployManager(Catalog catalog, long intervalMs) {
6868
protected void initEnvVariables(String envElectableFeServiceGroup, String envObserverFeServiceGroup,
6969
String envBackendServiceGroup, String envBrokerServiceGroup) {
7070
super.initEnvVariables(envElectableFeServiceGroup, envObserverFeServiceGroup, envBackendServiceGroup,
71-
envBrokerServiceGroup);
71+
envBrokerServiceGroup);
7272

7373
// namespace
7474
clusterInfoFile = Strings.nullToEmpty(System.getenv(ENV_APP_NAMESPACE));

fe/fe-core/src/main/java/org/apache/doris/metric/PrometheusMetricVisitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ public void getNodeInfo(StringBuilder sb) {
203203
sb.append(NODE_INFO).append("{type=\"be_node_num\", state=\"decommissioned\"} ")
204204
.append(Catalog.getCurrentSystemInfo().getDecommissionedBackendIds().size()).append("\n");
205205
sb.append(NODE_INFO).append("{type=\"broker_node_num\", state=\"dead\"} ").append(
206-
Catalog.getCurrentCatalog().getBrokerMgr().getAllBrokers().stream().filter(b -> !b.isAlive()).count()).append("\n");
206+
Catalog.getCurrentCatalog().getBrokerMgr().getAllBrokers().stream().filter(b -> !b.isAlive())
207+
.count()).append("\n");
207208

208209
// only master FE has this metrics, to help the Grafana knows who is the master
209210
if (Catalog.getCurrentCatalog().isMaster()) {

0 commit comments

Comments
 (0)