kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible version_conflict_engine_exception in bulk execution. (#7354)

This commit is contained in:
Ax1an 2021-07-21 20:48:52 +08:00 committed by GitHub
parent bd23f263e6
commit 3704567b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -112,6 +112,7 @@ Release Notes.
* Enhance persistent session timeout mechanism. Because the enhanced session could cache the metadata metrics forever,
new timeout mechanism is designed for avoiding this specific case.
* Fix Kafka transport topics are created duplicated with and without namespace issue
* Fix possible version_conflict_engine_exception in bulk execution.
#### UI

7
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java
View File

@ -102,10 +102,9 @@ public class EndpointRelationServerSideMetrics extends Metrics {
@Override
public int remoteHashCode() {
int result = 17;
result = 31 * result + entityId.hashCode();
result = (int) (31 * result + getTimeBucket());
return result;
int n = 17;
n = 31 * n + this.entityId.hashCode();
return n;
}
@Override

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java
View File

@ -114,7 +114,9 @@ public class ServiceInstanceRelationClientSideMetrics extends Metrics {
@Override
public int remoteHashCode() {
return hashCode();
int n = 17;
n = 31 * n + this.entityId.hashCode();
return n;
}
@Override

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java
View File

@ -114,7 +114,9 @@ public class ServiceInstanceRelationServerSideMetrics extends Metrics {
@Override
public int remoteHashCode() {
return hashCode();
int n = 17;
n = 31 * n + this.entityId.hashCode();
return n;
}
@Override

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java
View File

@ -100,7 +100,9 @@ public class ServiceRelationClientSideMetrics extends Metrics {
@Override
public int remoteHashCode() {
return this.hashCode();
int n = 17;
n = 31 * n + this.entityId.hashCode();
return n;
}
@Override

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java
View File

@ -100,7 +100,9 @@ public class ServiceRelationServerSideMetrics extends Metrics {
@Override
public int remoteHashCode() {
return this.hashCode();
int n = 17;
n = 31 * n + this.entityId.hashCode();
return n;
}
@Override