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

Show past deviation in monitor #4734

Merged
merged 21 commits into from Nov 3, 2020
Merged

Show past deviation in monitor #4734

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4f4f2c4
Move deviation calculation to InventoryMonitor and store it in Reques…
chimp1984 Oct 24, 2020
69b3997
Adjust warn/alert tiggers
chimp1984 Oct 24, 2020
3a9b3c9
Extract method
chimp1984 Oct 27, 2020
44d9efd
Replace the 2 deviation maps with one with DeviationInfo as value
chimp1984 Oct 27, 2020
db35eb2
Add check for repeated warn/alerts in past requests
chimp1984 Oct 27, 2020
af3e7fc
Update params
chimp1984 Oct 27, 2020
baaa100
Reset NumAllConnectionsLostEvents once we sent it to inventory monitor
chimp1984 Oct 29, 2020
37170ab
Ignore deviation at startup (2 min)
chimp1984 Oct 31, 2020
77666a6
Add commitHash entry
chimp1984 Oct 31, 2020
157f715
Update commit hash to 77666a6d
chimp1984 Oct 31, 2020
b0f8b96
Add filtered seed nodes info
chimp1984 Oct 31, 2020
72abd54
Update commit hash to b0f8b968
chimp1984 Oct 31, 2020
764d0fa
Add linebreak to filtered seeds
chimp1984 Oct 31, 2020
3d24a20
Update commit hash to 764d0fa4
chimp1984 Oct 31, 2020
ae365e2
Show filtered node in red
chimp1984 Oct 31, 2020
0847ddd
Update commit hash to ae365e2d
chimp1984 Oct 31, 2020
d789282
Use System.getProperty("line.separator") instead of \n
chimp1984 Oct 31, 2020
cdace6d
Update commit hash to d789282b
chimp1984 Oct 31, 2020
c526132
Add version/commit hash to header
chimp1984 Oct 31, 2020
5da5737
Use break for new lines
chimp1984 Oct 31, 2020
68a15d0
Remove 3f3cu2yw7u457ztq and fl3mmribyxgrv63c as they got shut down
chimp1984 Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestHandler.java
View file
Open in desktop
Expand Up @@ -24,6 +24,8 @@
import bisq.core.dao.monitoring.model.DaoStateBlock;
import bisq.core.dao.monitoring.model.ProposalStateBlock;
import bisq.core.dao.state.DaoStateService;
import bisq.core.filter.Filter;
import bisq.core.filter.FilterManager;
import bisq.core.network.p2p.inventory.messages.GetInventoryRequest;
import bisq.core.network.p2p.inventory.messages.GetInventoryResponse;
import bisq.core.network.p2p.inventory.model.InventoryItem;
Expand All @@ -47,6 +49,7 @@
import javax.inject.Named;

import com.google.common.base.Enums;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;

import java.util.HashMap;
Expand All @@ -66,6 +69,7 @@ public class GetInventoryRequestHandler implements MessageListener {
private final DaoStateMonitoringService daoStateMonitoringService;
private final ProposalStateMonitoringService proposalStateMonitoringService;
private final BlindVoteStateMonitoringService blindVoteStateMonitoringService;
private final FilterManager filterManager;
private final int maxConnections;

@Inject
Expand All @@ -76,6 +80,7 @@ public GetInventoryRequestHandler(NetworkNode networkNode,
DaoStateMonitoringService daoStateMonitoringService,
ProposalStateMonitoringService proposalStateMonitoringService,
BlindVoteStateMonitoringService blindVoteStateMonitoringService,
FilterManager filterManager,
@Named(Config.MAX_CONNECTIONS) int maxConnections) {
this.networkNode = networkNode;
this.peerManager = peerManager;
Expand All @@ -84,6 +89,7 @@ public GetInventoryRequestHandler(NetworkNode networkNode,
this.daoStateMonitoringService = daoStateMonitoringService;
this.proposalStateMonitoringService = proposalStateMonitoringService;
this.blindVoteStateMonitoringService = blindVoteStateMonitoringService;
this.filterManager = filterManager;
this.maxConnections = maxConnections;

this.networkNode.addMessageListener(this);
Expand Down Expand Up @@ -149,6 +155,11 @@ public void onMessage(NetworkEnvelope networkEnvelope, Connection connection) {
inventory.put(InventoryItem.usedMemory, String.valueOf(Profiler.getUsedMemoryInBytes()));
inventory.put(InventoryItem.jvmStartTime, String.valueOf(ManagementFactory.getRuntimeMXBean().getStartTime()));

Filter filter = filterManager.getFilter();
if (filter != null) {
inventory.put(InventoryItem.filteredSeeds, Joiner.on(", ").join(filter.getSeedNodes()));
}

log.info("Send inventory {} to {}", inventory, connection.getPeersNodeAddressOptional());
GetInventoryResponse getInventoryResponse = new GetInventoryResponse(inventory);
networkNode.sendMessage(connection, getInventoryResponse);
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/bisq/core/network/p2p/inventory/model/InventoryItem.java
View file
Open in desktop
Expand Up @@ -124,7 +124,8 @@ public enum InventoryItem {
version("version", false),
commitHash("commitHash", false),
usedMemory("usedMemory", true),
jvmStartTime("jvmStartTime", true);
jvmStartTime("jvmStartTime", true),
filteredSeeds("filteredSeeds", false);

@Getter
private final String key;
Expand Down
2 changes: 2 additions & 0 deletions inventory/src/main/java/bisq/inventory/InventoryWebServer.java
View file
Open in desktop
Expand Up @@ -176,6 +176,8 @@ private String getSeedNodeInfo(NodeAddress nodeAddress,
true, true) :
"n/a";
sb.append("Run duration: ").append(duration).append("<br/>");

sb.append("Filtered seed nodes: ").append(requestInfo.getDisplayValue(InventoryItem.filteredSeeds)).append("<br/>");
}

return sb.toString();
Expand Down