From 58d8fea6df8a556c682cf8291e92af45b83e313e Mon Sep 17 00:00:00 2001
From: eriwe600 <eriwe600@student.liu.se>
Date: Mon, 8 Mar 2021 08:45:42 +0100
Subject: [PATCH] Lab 5 done
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Erica Weistrand <Weistrand@users.noreply.github.com>
Co-authored-by: Andreas Lindstén <andli035@student.liu.se>
---
src/lab5/dbs/fortune_1.db | 8 +++++++-
src/lab5/dbs/fortune_2.db | 8 +++++++-
src/lab5/error1.tmp | 0
src/lab5/error2.tmp | 0
src/lab5/error3.tmp | 0
src/lab5/error4.tmp | 0
src/lab5/errors1.tmp | 0
src/lab5/errors2.tmp | 0
src/lab5/serverPeer.py | 5 ++++-
src/modules/Server/Lock/distributedReadWriteLock.py | 1 -
10 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 src/lab5/error1.tmp
create mode 100644 src/lab5/error2.tmp
create mode 100644 src/lab5/error3.tmp
create mode 100644 src/lab5/error4.tmp
create mode 100644 src/lab5/errors1.tmp
create mode 100644 src/lab5/errors2.tmp
diff --git a/src/lab5/dbs/fortune_1.db b/src/lab5/dbs/fortune_1.db
index 4acae8c..630867c 100644
--- a/src/lab5/dbs/fortune_1.db
+++ b/src/lab5/dbs/fortune_1.db
@@ -3017,5 +3017,11 @@ come at you rapidly.
"Style Invitational Report from Week 278" published
August 2, 1998
%
-fhhrihir
+c1
+%
+c2
+%
+c4
+%
+c3
%
diff --git a/src/lab5/dbs/fortune_2.db b/src/lab5/dbs/fortune_2.db
index 4acae8c..630867c 100644
--- a/src/lab5/dbs/fortune_2.db
+++ b/src/lab5/dbs/fortune_2.db
@@ -3017,5 +3017,11 @@ come at you rapidly.
"Style Invitational Report from Week 278" published
August 2, 1998
%
-fhhrihir
+c1
+%
+c2
+%
+c4
+%
+c3
%
diff --git a/src/lab5/error1.tmp b/src/lab5/error1.tmp
new file mode 100644
index 0000000..e69de29
diff --git a/src/lab5/error2.tmp b/src/lab5/error2.tmp
new file mode 100644
index 0000000..e69de29
diff --git a/src/lab5/error3.tmp b/src/lab5/error3.tmp
new file mode 100644
index 0000000..e69de29
diff --git a/src/lab5/error4.tmp b/src/lab5/error4.tmp
new file mode 100644
index 0000000..e69de29
diff --git a/src/lab5/errors1.tmp b/src/lab5/errors1.tmp
new file mode 100644
index 0000000..e69de29
diff --git a/src/lab5/errors2.tmp b/src/lab5/errors2.tmp
new file mode 100644
index 0000000..e69de29
diff --git a/src/lab5/serverPeer.py b/src/lab5/serverPeer.py
index 4906002..2e8c146 100755
--- a/src/lab5/serverPeer.py
+++ b/src/lab5/serverPeer.py
@@ -144,7 +144,10 @@ class Server(orb.Peer):
for key, value in self.peer_list.peers.items():
if (self.id != key):
- value.write_local([fortune])
+ try:
+ value.write_local([fortune])
+ except:
+ pass
finally:
self.drwlock.write_release()
diff --git a/src/modules/Server/Lock/distributedReadWriteLock.py b/src/modules/Server/Lock/distributedReadWriteLock.py
index 158e8bf..83ed71b 100644
--- a/src/modules/Server/Lock/distributedReadWriteLock.py
+++ b/src/modules/Server/Lock/distributedReadWriteLock.py
@@ -46,7 +46,6 @@ class DistributedReadWriteLock(readWriteLock.ReadWriteLock):
self.lock.acquire()
self.distributed_lock.acquire()
self.write_acquire_local()
- time.sleep(6)
pass
def write_release(self):
--
GitLab