Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Distributed-Systems
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Katharina Willig
Distributed-Systems
Commits
01442e2f
Commit
01442e2f
authored
7 months ago
by
Katharina
Browse files
Options
Downloads
Patches
Plain Diff
changes
parent
7e98b804
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
kclient.py
+41
-35
41 additions, 35 deletions
kclient.py
server.py
+19
-10
19 additions, 10 deletions
server.py
with
60 additions
and
45 deletions
kclient.py
+
41
−
35
View file @
01442e2f
#########problem: server is sticking to a process or something and cant process client messages :(
import
socket
import
socket
import
threading
import
threading
import
time
import
time
...
@@ -11,8 +12,8 @@ MY_HOST = socket.gethostname()
...
@@ -11,8 +12,8 @@ MY_HOST = socket.gethostname()
MY_IP
=
socket
.
gethostbyname
(
MY_HOST
)
MY_IP
=
socket
.
gethostbyname
(
MY_HOST
)
#print(f"host:{MY_HOST} and ip: {MY_IP}")
#print(f"host:{MY_HOST} and ip: {MY_IP}")
print
(
f
"
Listening for leader response on
{
broadcast_ip
}
:
{
broadcast_port
}
...
"
)
#
print(f"Listening for leader response on {broadcast_ip}:{broadcast_port}...")
#debug
print
(
MY_HOST
,
MY_IP
)
#
print(MY_HOST,MY_IP)
#debug
#stop_listening = False # control for listener
#stop_listening = False # control for listener
...
@@ -20,26 +21,25 @@ print(MY_HOST,MY_IP)
...
@@ -20,26 +21,25 @@ print(MY_HOST,MY_IP)
client_socket
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_DGRAM
)
client_socket
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_DGRAM
)
client_socket
.
setsockopt
(
socket
.
SOL_SOCKET
,
socket
.
SO_BROADCAST
,
1
)
client_socket
.
setsockopt
(
socket
.
SOL_SOCKET
,
socket
.
SO_BROADCAST
,
1
)
client_socket
.
setsockopt
(
socket
.
SOL_SOCKET
,
socket
.
SO_REUSEADDR
,
1
)
client_socket
.
setsockopt
(
socket
.
SOL_SOCKET
,
socket
.
SO_REUSEADDR
,
1
)
client_socket
.
bind
((
''
,
broadcast_port
))
# listen on broadcast
-port
client_socket
.
bind
((
''
,
broadcast_port
))
# listen on broadcast
#socket is bind to ALL available IP addresses
# global var for leader address
# global var for leader address
leader_address
=
None
leader_address
=
None
listener_ready
=
threading
.
Event
()
def
listen
():
def
listen
():
"""
receives messages from server and clients.
"""
"""
receives messages from server and clients.
"""
global
leader_address
global
leader_address
listener_ready
.
set
()
#makes sure that listener is ready
while
True
:
while
True
:
try
:
try
:
data
,
address
=
client_socket
.
recvfrom
(
4096
)
data
,
address
=
client_socket
.
recvfrom
(
4096
)
decoded_message
=
data
.
decode
()
decoded_message
=
data
.
decode
()
print
(
f
"
Received
{
data
.
decode
()
}
from
{
address
}
"
)
# Ignoriere Nachrichten mit Server-Kennung
#if decoded_message.startswith("["):
# continue
#ignores broadcast messages with own ip #################please enable it after testing!!!!!!!!!!!!!!!!!!!S
#ignores broadcast messages with own ip #################please enable it after testing!!!!!!!!!!!!!!!!!!!S
#if address[0]==MY_IP:
#if address[0]==MY_IP:
#
continue
#
continue
#####identifyLEADER############
#####identifyLEADER############
# Erkennen von LEADER-Nachrichten
# Erkennen von LEADER-Nachrichten
...
@@ -47,11 +47,11 @@ def listen():
...
@@ -47,11 +47,11 @@ def listen():
leader_uuid
=
decoded_message
.
split
(
"
:
"
)[
1
]
leader_uuid
=
decoded_message
.
split
(
"
:
"
)[
1
]
print
(
f
"
Leader discovered:
{
leader_uuid
}
at
{
address
[
0
]
}
:
{
address
[
1
]
}
"
)
print
(
f
"
Leader discovered:
{
leader_uuid
}
at
{
address
[
0
]
}
:
{
address
[
1
]
}
"
)
leader_address
=
(
address
[
0
],
broadcast_port
)
# IP-Adresse des Leaders speichern
leader_address
=
(
address
[
0
],
broadcast_port
)
# IP-Adresse des Leaders speichern
#
print(leader_address)
print
(
leader_address
)
#debug
continue
continue
#################################
#################################
if
"
HEARTBEAT:
"
in
decoded_message
:
if
"
HEARTBEAT:
"
in
decoded_message
:
continue
continue
#bringt nix...
print
(
decoded_message
)
print
(
decoded_message
)
...
@@ -59,35 +59,18 @@ def listen():
...
@@ -59,35 +59,18 @@ def listen():
print
(
f
"
An error occurred:
{
e
}
"
)
print
(
f
"
An error occurred:
{
e
}
"
)
break
break
############requestleader############
def
request_leader
():
"""
Sendet eine Anfrage, um den aktuellen Leader zu ermitteln.
"""
global
leader_address
print
(
"
Requesting current leader...
"
)
client_socket
.
sendto
(
"
REQUEST_LEAD
"
.
encode
(),
(
broadcast_ip
,
broadcast_port
))
timeout
=
time
.
time
()
+
5
# 10 Sekunden auf Antwort warten
while
time
.
time
()
<
timeout
:
if
leader_address
:
#print("leader address:", leader_address)
#client_socket.sendto("REQUEST_LEAD finish".encode(), leader_address)
return
time
.
sleep
(
0.5
)
# Warten, bis eine Antwort vom Leader eintrifft
#print("No leader found. Unable to send messages.")
####################################
def
sender
():
def
sender
():
"""
Ermöglicht dem Benutzer, Nachrichten zu schreiben und zu senden.
"""
"""
Ermöglicht dem Benutzer, Nachrichten zu schreiben und zu senden.
"""
global
leader_address
global
leader_address
nickname
=
input
(
"
Enter your nickname:
"
)
print
(
"
Requesting leader before starting...
"
)
print
(
"
Requesting leader before starting...
"
)
request_leader
()
# Versuche, den Leader zu finden
#
request_leader() # Versuche, den Leader zu finden
#########print(leader_address)###########debug: answer: None
#########print(leader_address)###########debug: answer: None
if
not
leader_address
:
if
not
leader_address
:
print
(
"
No leader found. Exiting...
"
)
print
(
"
No leader found. Exiting...
"
)
return
return
nickname
=
input
(
"
Enter your nickname:
"
)
just_nickname
=
f
"
{
nickname
}
entered the chat
"
.
encode
()
just_nickname
=
f
"
{
nickname
}
entered the chat
"
.
encode
()
#client_socket.sendto(just_nickname, (broadcast_ip, broadcast_port))
#client_socket.sendto(just_nickname, (broadcast_ip, broadcast_port))
client_socket
.
sendto
(
just_nickname
,
leader_address
)
client_socket
.
sendto
(
just_nickname
,
leader_address
)
...
@@ -105,16 +88,39 @@ def sender():
...
@@ -105,16 +88,39 @@ def sender():
else
:
else
:
print
(
"
No leader available. Unable to send message.
"
)
print
(
"
No leader available. Unable to send message.
"
)
############requestleader############
def
request_leader
():
"""
Sendet eine Anfrage, um den aktuellen Leader zu ermitteln.
"""
global
leader_address
print
(
"
Requesting current leader...
"
)
client_socket
.
sendto
(
"
REQUEST_LEAD
"
.
encode
(),
(
broadcast_ip
,
broadcast_port
))
timeout
=
time
.
time
()
+
10
# 5 Sekunden auf Antwort warten
while
time
.
time
()
<
timeout
:
if
leader_address
:
print
(
"
leader address:
"
,
leader_address
)
#client_socket.sendto("REQUEST_LEAD finish".encode(), leader_address)
return
time
.
sleep
(
0.5
)
# Warten, bis eine Antwort vom Leader eintrifft
#print("No leader found. Unable to send messages.")
####################################
if
__name__
==
"
__main__
"
:
# starts listen-thread
# starts listen-thread
listen_thread
=
threading
.
Thread
(
target
=
listen
)
listen_thread
=
threading
.
Thread
(
target
=
listen
)
#Daemon Thread does not block the main thread from exiting and continues to run in the background
#Daemon Thread does not block the main thread from exiting and continues to run in the background
listen_thread
.
daemon
=
True
listen_thread
.
daemon
=
True
listen_thread
.
start
()
listen_thread
.
start
()
#print(listen_thread.is_alive())
#print(listen_thread.is_alive())
listener_ready
.
wait
()
request_leader
()
# starts sender-function in main thread
# starts sender-function in main thread
#sender()
#sender()
sender_thread
=
threading
.
Thread
(
target
=
sender
)
sender_thread
=
threading
.
Thread
(
target
=
sender
)
#sender_thread.daemon = True
#sender_thread.daemon = True
sender_thread
.
start
()
sender_thread
.
start
()
#print(sender_thread.is_alive())
#print(sender_thread.is_alive())
#request_thread = threading.Thread(target=request_leader_thread)
#request_thread.start()
This diff is collapsed.
Click to expand it.
server.py
+
19
−
10
View file @
01442e2f
...
@@ -22,6 +22,7 @@ active_servers = {}
...
@@ -22,6 +22,7 @@ active_servers = {}
def
broadcast
(
message
):
def
broadcast
(
message
):
"""
Sends messages to all server IDs in the network.
"""
"""
Sends messages to all server IDs in the network.
"""
full_message
=
f
"
{
message
}
"
.
encode
()
full_message
=
f
"
{
message
}
"
.
encode
()
#full_message = f"[{shared_data['server_id']}] {message}".encode() #sends serverid with every message
server_socket
.
sendto
(
full_message
,
(
broadcast_ip
,
broadcast_port
))
server_socket
.
sendto
(
full_message
,
(
broadcast_ip
,
broadcast_port
))
...
@@ -36,8 +37,13 @@ def listen(queue, shared_data):
...
@@ -36,8 +37,13 @@ def listen(queue, shared_data):
decoded_message
=
message
.
decode
()
decoded_message
=
message
.
decode
()
# Ignore messages from this server
# Ignore messages from this server
if
decoded_message
.
startswith
(
f
"
[
{
shared_data
[
'
server_id
'
]
}
]
"
):
#v1
continue
#if decoded_message.startswith(f"[{shared_data['server_id']}]"):
# continue
#v2
#if decoded_message.startswith(f"[{shared_data['server_id']}]") or client_address[0] == socket.gethostbyname(socket.gethostname()):
# continue
print
(
f
"
Received from
{
client_address
}
:
{
decoded_message
}
"
)
print
(
f
"
Received from
{
client_address
}
:
{
decoded_message
}
"
)
...
@@ -51,13 +57,16 @@ def listen(queue, shared_data):
...
@@ -51,13 +57,16 @@ def listen(queue, shared_data):
if
shared_data
[
'
current_leader
'
]:
if
shared_data
[
'
current_leader
'
]:
#while "REQUEST_LEAD finish" not in decoded_message:
#while "REQUEST_LEAD finish" not in decoded_message:
response
=
f
"
LEADER:
{
shared_data
[
'
current_leader
'
]
}
"
.
encode
()
response
=
f
"
LEADER:
{
shared_data
[
'
current_leader
'
]
}
"
.
encode
()
time
.
sleep
(
2
)
#wait before sending response that client can prepare for answer
time
.
sleep
(
4
)
#wait before sending response that client can prepare for answer
server_socket
.
sendto
(
response
,
(
broadcast_ip
,
broadcast_port
))
#broadcast(response, client_address)
server_socket
.
sendto
(
response
,
client_address
)
#does not work atm bc same socket for client...?
#broadcast(response) #bad solution
#print("response:", response) #debug
print
(
f
"
Sent leader information to
{
client_address
}
:
{
response
.
decode
()
}
"
)
#for debug
print
(
f
"
Sent leader information to
{
client_address
}
:
{
response
.
decode
()
}
"
)
#for debug
#time.sleep(2)
else
:
else
:
print
(
"
No leader set, unable to respond to REQUEST_LEAD
"
)
print
(
"
No leader set, unable to respond to REQUEST_LEAD
"
)
#
continue
continue
# Put message in the queue for election process
# Put message in the queue for election process
...
@@ -71,7 +80,7 @@ def listen(queue, shared_data):
...
@@ -71,7 +80,7 @@ def listen(queue, shared_data):
# Leader election function
# Leader election function
def
start_election
(
queue
,
shared_data
):
def
start_election
(
queue
,
shared_data
):
"""
Starts leader election based on received messages.
"""
"""
Starts leader election based on received messages.
"""
#
global active_servers
global
active_servers
#current_leader = None
#current_leader = None
print
(
"
Starting election...
"
)
print
(
"
Starting election...
"
)
broadcast
(
f
"
START_ELECTION:
{
shared_data
[
'
server_id
'
]
}
"
)
broadcast
(
f
"
START_ELECTION:
{
shared_data
[
'
server_id
'
]
}
"
)
...
@@ -79,6 +88,7 @@ def start_election(queue, shared_data):
...
@@ -79,6 +88,7 @@ def start_election(queue, shared_data):
timeout
=
time
.
time
()
+
20
# 20-second timeout, waiting for other servers
timeout
=
time
.
time
()
+
20
# 20-second timeout, waiting for other servers
highest_id
=
shared_data
[
'
server_id
'
]
highest_id
=
shared_data
[
'
server_id
'
]
#while current time is smaller than current time plus 20s:
while
time
.
time
()
<
timeout
:
while
time
.
time
()
<
timeout
:
try
:
try
:
message
=
queue
.
get
(
timeout
=
1
)
#waits 1 sec for a message
message
=
queue
.
get
(
timeout
=
1
)
#waits 1 sec for a message
...
@@ -89,7 +99,7 @@ def start_election(queue, shared_data):
...
@@ -89,7 +99,7 @@ def start_election(queue, shared_data):
active_servers
[
sender_uuid
]
=
time
.
time
()
active_servers
[
sender_uuid
]
=
time
.
time
()
print
(
f
"
Received UUID for election:
{
sender_uuid
}
"
)
print
(
f
"
Received UUID for election:
{
sender_uuid
}
"
)
################dumblogic###onlyworkswith2
s
erver
s
################################
################dumblogic###onlyworkswith2
1
erver################################
if
sender_uuid
>
highest_id
:
if
sender_uuid
>
highest_id
:
highest_id
=
sender_uuid
highest_id
=
sender_uuid
print
(
f
"
Received higher ID
{
sender_uuid
}
, forwarding...
"
)
print
(
f
"
Received higher ID
{
sender_uuid
}
, forwarding...
"
)
...
@@ -127,10 +137,9 @@ def send_heartbeat(shared_data):
...
@@ -127,10 +137,9 @@ def send_heartbeat(shared_data):
"""
Sends heartbeat messages to keep the server active.
"""
"""
Sends heartbeat messages to keep the server active.
"""
time
.
sleep
(
30
)
#waiting for leader election #set to 20s
time
.
sleep
(
30
)
#waiting for leader election #set to 20s
while
True
:
while
True
:
broadcast
(
f
"
HEARTBEAT:
{
shared_data
[
'
server_id
'
]
}
"
)
broadcast
(
f
"
HEARTBEAT:
{
shared_data
[
'
server_id
'
]
}
"
)
#please change that to right neighbour after correct leader election
time
.
sleep
(
5
)
time
.
sleep
(
5
)
# Monitor heartbeats
# Monitor heartbeats
def
monitor_heartbeats
():
def
monitor_heartbeats
():
"""
Checks active servers based on heartbeat messages.
"""
"""
Checks active servers based on heartbeat messages.
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment