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

[Bugfix][zeta] Fix the serialization issue of GetMetricsOperation during multi-node operation. #5206

Merged
merged 1 commit into from
Aug 9, 2023
Merged

[Bugfix][zeta] Fix the serialization issue of GetMetricsOperation during multi-node operation. #5206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 1 addition & 12 deletions ...el-engine-server/src/main/java/org/apache/seatunnel/engine/server/CoordinatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;

import static org.apache.seatunnel.api.common.metrics.MetricTags.JOB_ID;
import static org.apache.seatunnel.engine.server.metrics.JobMetricsUtil.toJobMetricsMap;

public class CoordinatorService {
Expand Down Expand Up @@ -567,17 +566,7 @@ public Map<Long, JobMetrics> getRunningJobMetrics() {
(RawJobMetrics)
NodeEngineUtil.sendOperationToMemberNode(
nodeEngine,
new GetMetricsOperation(
dis ->
(dis.tagValue(JOB_ID)
!= null
&& runningJobIds
.contains(
Long
.parseLong(
dis
.tagValue(
JOB_ID))))),
new GetMetricsOperation(runningJobIds),
address)
.get();
metrics.add(rawJobMetrics);
Expand Down
23 changes: 17 additions & 6 deletions .../src/main/java/org/apache/seatunnel/engine/server/task/operation/GetMetricsOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,22 @@
import com.hazelcast.spi.impl.operationservice.Operation;

import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;

public class GetMetricsOperation extends Operation implements IdentifiedDataSerializable {
import static org.apache.seatunnel.api.common.metrics.MetricTags.JOB_ID;

private Predicate<MetricDescriptor> metricDescriptorPredicate;
public class GetMetricsOperation extends Operation implements IdentifiedDataSerializable {
private RawJobMetrics response;
private Set<Long> runningJobIds;

public GetMetricsOperation() {}

public GetMetricsOperation(Predicate<MetricDescriptor> metricDescriptorPredicate) {
this.metricDescriptorPredicate = metricDescriptorPredicate;
public GetMetricsOperation(Set<Long> runningJobIds) {
this.runningJobIds = runningJobIds;
}

@Override
Expand All @@ -60,6 +65,10 @@ public void run() {
+ " because it is not master. Master is: "
+ masterAddress);
}
Predicate<MetricDescriptor> metricDescriptorPredicate =
dis ->
(dis.tagValue(JOB_ID) != null
&& runningJobIds.contains(Long.parseLong(dis.tagValue(JOB_ID))));

ZetaMetricsCollector metricsRenderer =
new ZetaMetricsCollector(
Expand All @@ -71,13 +80,15 @@ public void run() {
@Override
protected void writeInternal(ObjectDataOutput out) throws IOException {
super.writeInternal(out);
out.writeObject(metricDescriptorPredicate);
out.writeLongArray(runningJobIds.stream().mapToLong(Long::longValue).toArray());
}

@Override
protected void readInternal(ObjectDataInput in) throws IOException {
super.readInternal(in);
this.metricDescriptorPredicate = in.readObject();
this.runningJobIds =
Arrays.stream(Objects.requireNonNull(in.readLongArray()))
.collect(HashSet::new, HashSet::add, HashSet::addAll);
}

@Override
Expand Down
Loading