Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize gateway/hiveEngineConn/Entrance modules #967

Merged
merged 3 commits into from
Aug 20, 2021
Merged

Optimize gateway/hiveEngineConn/Entrance modules #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae51cd5
remove instance-label client dependency
peacewong Aug 19, 2021
99efa0a
exclude pentaho-aggdesigner-algorithm module
peacewong Aug 19, 2021
1525eb4
Solve the host name and ip judgment abnormality in the gateway router
peacewong Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions linkis-computation-governance/linkis-entrance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@
<version>${linkis.version}</version>
</dependency>

<dependency>
<!--<dependency>
<groupId>com.webank.wedatasphere.linkis</groupId>
<artifactId>linkis-instance-label-client</artifactId>
<version>${linkis.version}</version>
</dependency>
</dependency>-->

</dependencies>

Expand Down
4 changes: 4 additions & 0 deletions linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@
<artifactId>hive-exec</artifactId>
<version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-ant</artifactId>
Expand Down
18 changes: 9 additions & 9 deletions ...eway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ abstract class AbstractGatewayRouter extends GatewayRouter with Logging {
else None
}

protected def retainAllInRegistry(serviceId: String, serviceInstances: util.List[ServiceInstance]): util.List[ServiceInstance] ={
val instancesInRegistry = SpringCloudFeignConfigurationCache.getDiscoveryClient
.getInstances(serviceId).map( instance => instance.getHost + ":" + instance.getPort)
protected def retainAllInRegistry(serviceId: String, serviceInstances: util.List[ServiceInstance]): util.List[ServiceInstance] = {
val instancesInRegistry = ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId)
serviceInstances.filter(instance => {
instancesInRegistry.contains(instance.getInstance)
instancesInRegistry.contains(instance)
})
}

protected def removeAllFromRegistry(serviceId: String, serviceInstances: util.List[ServiceInstance]): util.List[ServiceInstance] = {
var serviceInstancesInRegistry = SpringCloudFeignConfigurationCache.getDiscoveryClient
.getInstances(serviceId).map( instance =>
ServiceInstance(serviceId, instance.getHost + ":" + instance.getPort)
)
var serviceInstancesInRegistry = ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId)
serviceInstances.foreach(serviceInstance => {
serviceInstancesInRegistry = serviceInstancesInRegistry.filterNot(_.equals(serviceInstance))
})
serviceInstancesInRegistry
if (null == serviceInstancesInRegistry) {
new util.ArrayList[ServiceInstance]()
} else {
serviceInstancesInRegistry.toList
}
}
}

Expand Down