mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-04 00:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

take server size into account when picking a server

Browse Source
This commit is contained in:
Julian Krings 2024-09-08 13:41:08 +02:00
parent d22f49492f
commit 62fff7a56e
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/volmit/iris/server/master/IrisMasterClient.java
View File

@ -8,6 +8,7 @@ import com.volmit.iris.server.packet.init.PingPacket;
import com.volmit.iris.server.util.ConnectionHolder; import com.volmit.iris.server.util.ConnectionHolder;
import com.volmit.iris.server.util.PacketListener; import com.volmit.iris.server.util.PacketListener;
import com.volmit.iris.server.util.PacketSendListener; import com.volmit.iris.server.util.PacketSendListener;
import com.volmit.iris.util.collection.KList;
import lombok.Getter; import lombok.Getter;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -55,6 +56,14 @@ public class IrisMasterClient implements ConnectionHolder, PacketListener {
session.onClientPacket(this, raw); session.onClientPacket(this, raw);
} }
public KList<String> getVersions() {
try {
return pingResponse.get().getVersion();
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
}
}
public int getNodeCount() { public int getNodeCount() {
try { try {
return nodeCount.get(); return nodeCount.get();

28
core/src/main/java/com/volmit/iris/server/master/IrisMasterServer.java
View File

@ -6,9 +6,11 @@ import com.volmit.iris.server.util.PregenHolder;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.parallel.MultiBurst;
import lombok.extern.java.Log; import lombok.extern.java.Log;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -45,13 +47,16 @@ public class IrisMasterServer extends IrisServer {
private void addNode(InetSocketAddress address) throws InterruptedException { private void addNode(InetSocketAddress address) throws InterruptedException {
var ping = new PingConnection(address); var ping = new PingConnection(address);
try { try {
for (String version : ping.getVersion().get()) addNode(address, ping.getVersion().get());
addNode(address, version);
} catch (ExecutionException e) { } catch (ExecutionException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
public void addNode(InetSocketAddress address, Collection<String> versions) {
versions.forEach(v -> addNode(address, v));
}
public void addNode(InetSocketAddress address, String version) { public void addNode(InetSocketAddress address, String version) {
nodes.computeIfAbsent(version, v -> new KSet<>()).add(address); nodes.computeIfAbsent(version, v -> new KSet<>()).add(address);
} }
@ -80,14 +85,27 @@ public class IrisMasterServer extends IrisServer {
master.getLogger().info("Requesting nodes for session " + uuid); master.getLogger().info("Requesting nodes for session " + uuid);
var map = new KMap<IrisMasterClient, KMap<UUID, PregenHolder>>(); var map = new KMap<IrisMasterClient, KMap<UUID, PregenHolder>>();
for (var address : master.nodes.getOrDefault(version, new KSet<>())) { if (!master.nodes.containsKey(version)) {
master.getLogger().warning("No nodes found for version " + version);
return map;
}
var nodes = master.nodes.get(version);
var remove = new KList<InetSocketAddress>();
var burst = MultiBurst.burst.burst(nodes.size());
for (var address : nodes) {
burst.queue(() -> {
try { try {
map.put(IrisConnection.connect(address, new IrisMasterClient(version, session)), new KMap<>()); var client = new IrisMasterClient(version, session);
master.addNode(address, client.getVersions());
map.put(IrisConnection.connect(address, client), new KMap<>());
} catch (Throwable e) { } catch (Throwable e) {
master.getLogger().log(Level.WARNING, "Failed to connect to server " + address, e); master.getLogger().log(Level.WARNING, "Failed to connect to server " + address, e);
master.removeNode(address); remove.add(address);
} }
});
} }
burst.complete();
remove.forEach(nodes::remove);
master.sessions.put(uuid, map); master.sessions.put(uuid, map);
return map; return map;

2
core/src/main/java/com/volmit/iris/server/master/IrisMasterSession.java
View File

@ -116,7 +116,7 @@ public class IrisMasterSession implements ConnectionHolder, PacketListener {
private IrisMasterClient pick() throws RejectedException { private IrisMasterClient pick() throws RejectedException {
return clients.keySet() return clients.keySet()
.stream() .stream()
.min(Comparator.comparingInt(c -> clients.get(c).size())) .min(Comparator.comparingDouble(c -> (double) clients.get(c).size() / c.getNodeCount()))
.orElseThrow(() -> new RejectedException("No clients available")); .orElseThrow(() -> new RejectedException("No clients available"));
} }