Skip to content

Modify TargetPollEvent to be per batch update (not per target) #2965

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

Merged
strailov merged 3 commits into from
Mar 25, 2026
+17 −8
Merged

Modify TargetPollEvent to be per batch update (not per target) #2965

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
86ac518
Modify TargetPollEvent to be per batch update (not per target)
strailov Mar 20, 2026
27e3b74
Get use of remote event's timestame for targetPollEvent
strailov Mar 24, 2026
df02202
Revert "Get use of remote event's timestame for targetPollEvent"
strailov Mar 24, 2026
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
18 changes: 13 additions & 5 deletions ...sitory-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetPollEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
package org.eclipse.hawkbit.repository.event.remote;

import java.io.Serial;
import java.util.Collections;
import java.util.List;

import lombok.EqualsAndHashCode;
import lombok.Getter;
Expand All @@ -29,16 +31,22 @@ public class TargetPollEvent extends RemoteTenantAwareEvent {
@Serial
private static final long serialVersionUID = 1L;

private String controllerId;
private String targetAddress;
private long lastTargetPoll;
private List<String> controllerIds;

public TargetPollEvent(final String controllerId, final String tenant) {
super(tenant, controllerId);
this.controllerId = controllerId;
public TargetPollEvent(final List<String> controllerIds, final long lastTargetPoll, final String tenant) {
super(tenant, tenant); // source is tenant
this.lastTargetPoll = lastTargetPoll;
this.controllerIds = Collections.unmodifiableList(controllerIds);
}

public TargetPollEvent(final String controllerId, final long timestamp, final String tenant) {
this(List.of(controllerId), timestamp, tenant);
}

public TargetPollEvent(final Target target) {
this(target.getControllerId(), target.getTenant());
this(List.of(target.getControllerId()), target.getLastTargetQuery(), target.getTenant()); // here expect last target query to be already set
this.targetAddress = target.getAddress();
}
}
7 changes: 4 additions & 3 deletions .../src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaControllerManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,10 @@ private Void updateLastTargetQueries(final String tenant, final List<TargetPoll>
Constants.MAX_ENTRIES_IN_STATEMENT);

pollChunks.forEach(chunk -> {
setLastTargetQuery(tenant, java.lang.System.currentTimeMillis(), chunk);
chunk.forEach(controllerId -> afterCommit(() -> EventPublisherHolder.getInstance().getEventPublisher()
.publishEvent(new TargetPollEvent(controllerId, tenant))));
final long lastTargetQuery = java.lang.System.currentTimeMillis();
setLastTargetQuery(tenant, lastTargetQuery, chunk);
afterCommit(() -> EventPublisherHolder.getInstance().getEventPublisher()
.publishEvent(new TargetPollEvent(chunk, lastTargetQuery, tenant)));
});

return null;
Expand Down
Loading