Browse Source
* [Improvement][Remote] Improve unit tests * [Improvement][Worker] Improve worker load balance * [Improvement][Worker] Fix code smells * [Improvement][Worker] Rename weight to hostWeightpull/3/MERGE
Shiwen Cheng
4 years ago
committed by
GitHub
33 changed files with 412 additions and 388 deletions
@ -0,0 +1,77 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You 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 |
||||
* |
||||
* http://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 org.apache.dolphinscheduler.server.master.dispatch.host.assign; |
||||
|
||||
import org.apache.dolphinscheduler.remote.utils.Host; |
||||
|
||||
/** |
||||
* host worker |
||||
*/ |
||||
public class HostWorker extends Host { |
||||
|
||||
/** |
||||
* host weight |
||||
*/ |
||||
private int hostWeight; |
||||
|
||||
/** |
||||
* worker group |
||||
*/ |
||||
private String workerGroup; |
||||
|
||||
public HostWorker(String ip, int port, int hostWeight, String workerGroup) { |
||||
super(ip, port); |
||||
this.hostWeight = hostWeight; |
||||
this.workerGroup = workerGroup; |
||||
} |
||||
|
||||
public HostWorker(String address, int hostWeight, String workerGroup) { |
||||
super(address); |
||||
this.hostWeight = hostWeight; |
||||
this.workerGroup = workerGroup; |
||||
} |
||||
|
||||
public int getHostWeight() { |
||||
return hostWeight; |
||||
} |
||||
|
||||
public void setHostWeight(int hostWeight) { |
||||
this.hostWeight = hostWeight; |
||||
} |
||||
|
||||
public String getWorkerGroup() { |
||||
return workerGroup; |
||||
} |
||||
|
||||
public void setWorkerGroup(String workerGroup) { |
||||
this.workerGroup = workerGroup; |
||||
} |
||||
|
||||
public static HostWorker of(String address, int hostWeight, String workerGroup) { |
||||
return new HostWorker(address, hostWeight, workerGroup); |
||||
} |
||||
|
||||
@Override |
||||
public String toString() { |
||||
return "Host{" |
||||
+ "hostWeight=" + hostWeight |
||||
+ ", workerGroup='" + workerGroup + '\'' |
||||
+ '}'; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,43 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You 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 |
||||
* |
||||
* http://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 org.apache.dolphinscheduler.server.master.dispatch.host.assign; |
||||
|
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
|
||||
public class HostWorkerTest { |
||||
|
||||
@Test |
||||
public void testHostWorker1() { |
||||
HostWorker hostWorker = new HostWorker("192.158.2.2", 11, 20, "default"); |
||||
Assert.assertEquals("192.158.2.2", hostWorker.getIp()); |
||||
Assert.assertEquals(11, hostWorker.getPort()); |
||||
Assert.assertEquals(20, hostWorker.getHostWeight()); |
||||
Assert.assertEquals("default", hostWorker.getWorkerGroup()); |
||||
} |
||||
|
||||
@Test |
||||
public void testHostWorker2() { |
||||
HostWorker hostWorker = HostWorker.of("192.158.2.2:22", 80, "default"); |
||||
Assert.assertEquals("192.158.2.2", hostWorker.getIp()); |
||||
Assert.assertEquals(22, hostWorker.getPort()); |
||||
Assert.assertEquals(80, hostWorker.getHostWeight()); |
||||
Assert.assertEquals("default", hostWorker.getWorkerGroup()); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue