stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 12:37:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slight config cleanup

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-05-14 18:47:39 +02:00
parent 4f7c7927f3
commit 6e37c26845
8 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dhfs-parent/dhfs-fs/src/main/resources/application.properties
View File

@@ -1,7 +1,5 @@
quarkus.grpc.server.use-separate-server=false
dhfs.objects.peerdiscovery.port=42069
dhfs.objects.peerdiscovery.interval=4s
dhfs.objects.peerdiscovery.broadcast=true
dhfs.objects.sync.timeout=30
dhfs.objects.sync.ping.timeout=5
dhfs.objects.invalidation.threads=16

2
dhfs-parent/dhfs-fuse/src/main/resources/application.properties
View File

@@ -1,7 +1,5 @@
quarkus.grpc.server.use-separate-server=false
dhfs.objects.peerdiscovery.port=42069
dhfs.objects.peerdiscovery.interval=4s
dhfs.objects.peerdiscovery.broadcast=true
dhfs.objects.sync.timeout=30
dhfs.objects.sync.ping.timeout=5
dhfs.objects.invalidation.threads=16

20
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java
View File

@@ -23,6 +23,8 @@ import java.net.*;
public class LocalPeerDiscoveryBroadcaster {
@Inject
PersistentPeerDataService persistentPeerDataService;
@Inject
LocalPeerDiscoveryConfig localPeerDiscoveryConfig;
@ConfigProperty(name = "quarkus.http.port")
int ourPort;
@@ -30,17 +32,11 @@ public class LocalPeerDiscoveryBroadcaster {
@ConfigProperty(name = "quarkus.http.ssl-port")
int ourSecurePort;
@ConfigProperty(name = "dhfs.objects.peerdiscovery.port")
int broadcastPort;
@ConfigProperty(name = "dhfs.objects.peerdiscovery.broadcast")
boolean enabled;
private DatagramSocket _socket;
@Startup
void init() throws SocketException {
if (!enabled) {
if (!localPeerDiscoveryConfig.broadcast()) {
return;
}
_socket = new DatagramSocket();
@@ -48,7 +44,7 @@ public class LocalPeerDiscoveryBroadcaster {
}
void shutdown(@Observes @Priority(10) ShutdownEvent event) {
if (!enabled) {
if (!localPeerDiscoveryConfig.broadcast()) {
return;
}
_socket.close();
@@ -56,7 +52,7 @@ public class LocalPeerDiscoveryBroadcaster {
@Scheduled(every = "${dhfs.objects.peerdiscovery.interval}", concurrentExecution = Scheduled.ConcurrentExecution.SKIP, skipExecutionIf = Scheduled.ApplicationNotRunning.class)
public void broadcast() throws Exception {
if (!enabled) {
if (!localPeerDiscoveryConfig.broadcast()) {
return;
}
var sendData = PeerDiscoveryInfo.newBuilder()
@@ -69,7 +65,7 @@ public class LocalPeerDiscoveryBroadcaster {
DatagramPacket sendPacket
= new DatagramPacket(sendBytes, sendBytes.length,
InetAddress.getByName("255.255.255.255"), broadcastPort);
InetAddress.getByName("255.255.255.255"), localPeerDiscoveryConfig.port());
_socket.send(sendPacket);
@@ -92,15 +88,13 @@ public class LocalPeerDiscoveryBroadcaster {
}
try {
sendPacket = new DatagramPacket(sendBytes, sendBytes.length, broadcast, broadcastPort);
sendPacket = new DatagramPacket(sendBytes, sendBytes.length, broadcast, localPeerDiscoveryConfig.port());
_socket.send(sendPacket);
Log.tracev("Broadcast sent to: {0}, at: {1}", broadcast.getHostAddress(), networkInterface.getDisplayName());
} catch (Exception ignored) {
continue;
}
// Log.trace(getClass().getName() + "Broadcast sent to: " + broadcast.getHostAddress()
// + ", at: " + networkInterface.getDisplayName());
}
}
}

13
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryClient.java
View File

@@ -14,7 +14,6 @@ import jakarta.annotation.Priority;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import java.net.*;
import java.nio.ByteBuffer;
@@ -28,17 +27,19 @@ import java.nio.ByteBuffer;
public class LocalPeerDiscoveryClient {
@Inject
PeerDiscoveryDirectory peerDiscoveryDirectory;
@ConfigProperty(name = "dhfs.objects.peerdiscovery.broadcast")
boolean enabled;
@Inject
LocalPeerDiscoveryConfig localPeerDiscoveryConfig;
;
private Thread _clientThread;
private DatagramSocket _socket;
@Startup
void init() throws SocketException, UnknownHostException {
if (!enabled) {
if (!localPeerDiscoveryConfig.broadcast()) {
return;
}
_socket = new DatagramSocket(42069, InetAddress.getByName("0.0.0.0"));
_socket = new DatagramSocket(localPeerDiscoveryConfig.port(), InetAddress.getByName("0.0.0.0"));
_socket.setBroadcast(true);
_clientThread = new Thread(this::client);
@@ -47,7 +48,7 @@ public class LocalPeerDiscoveryClient {
}
void shutdown(@Observes @Priority(10) ShutdownEvent event) throws InterruptedException {
if (!enabled) {
if (!localPeerDiscoveryConfig.broadcast()) {
return;
}
_socket.close();

16
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryConfig.java Normal file
View File

@@ -0,0 +1,16 @@
package com.usatiuk.dhfs.peerdiscovery.local;
import io.smallrye.config.ConfigMapping;
import io.smallrye.config.WithDefault;
@ConfigMapping(prefix = "dhfs.objects.peerdiscovery")
public interface LocalPeerDiscoveryConfig {
@WithDefault("42168")
int port();
@WithDefault("true")
boolean broadcast();
String interval();
}

2
dhfs-parent/sync-base/src/main/resources/application.properties
View File

@@ -1,7 +1,5 @@
quarkus.grpc.server.use-separate-server=false
dhfs.objects.peerdiscovery.port=42069
dhfs.objects.peerdiscovery.interval=4s
dhfs.objects.peerdiscovery.broadcast=true
dhfs.objects.sync.timeout=30
dhfs.objects.sync.ping.timeout=5
dhfs.objects.invalidation.threads=16

4
run-wrapper/run
View File

@@ -37,8 +37,8 @@ fi
"$JAVA_EXEC" \
-Xmx512M \
--enable-preview \
-Ddhfs.objects.writeback.limit=134217728 \
-Ddhfs.objects.lru.limit=134217728 \
-Ddhfs.objects.writeback.limit=16777216 \
-Ddhfs.objects.lru.limit=67108864 \
--add-exports java.base/sun.nio.ch=ALL-UNNAMED \
--add-exports java.base/jdk.internal.access=ALL-UNNAMED \
--add-opens=java.base/java.nio=ALL-UNNAMED \

4
run-wrapper/run.ps1
View File

@@ -24,8 +24,8 @@ Write-Host "Extra options: $($ExtraOptsParsed -join ' ')"
$JAVA_OPTS = @(
"-Xmx512M"
"--enable-preview"
"-Ddhfs.objects.writeback.limit=134217728"
"-Ddhfs.objects.lru.limit=134217728"
"-Ddhfs.objects.writeback.limit=16777216"
"-Ddhfs.objects.lru.limit=67108864"
"--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED"
"--add-exports", "java.base/jdk.internal.access=ALL-UNNAMED"
"--add-opens=java.base/java.nio=ALL-UNNAMED"