Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ece428mp1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
azukor2
ece428mp1
Commits
44fb8460
Commit
44fb8460
authored
3 years ago
by
Jeffrey Zhang
Browse files
Options
Downloads
Patches
Plain Diff
Fix proposer sort error
parent
f4713cc5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Messages.py
+1
-0
1 addition, 0 deletions
Messages.py
TransactionDeliverer.py
+13
-52
13 additions, 52 deletions
TransactionDeliverer.py
node.config
+5
-4
5 additions, 4 deletions
node.config
with
19 additions
and
56 deletions
Messages.py
+
1
−
0
View file @
44fb8460
...
...
@@ -45,6 +45,7 @@ class ProposedPriorityMessage(Message):
class
AgreedPriorityMessage
(
Message
):
transaction_ID
:
str
agreed_priority
:
int
proposer
:
str
def
receive_action
(
self
,
td
:
TransactionDeliverer
)
->
bool
:
td
.
process_agreed_priority_message
(
self
)
...
...
This diff is collapsed.
Click to expand it.
TransactionDeliverer.py
+
13
−
52
View file @
44fb8460
...
...
@@ -64,16 +64,7 @@ class TransactionDeliverer:
queue_item
=
_Transaction_Message_Queue_Item
(
proposed_priority
,
self
.
node_name
,
transaction_message
,
1
)
self
.
transactions_queue
.
append
(
queue_item
)
try
:
self
.
transactions_queue
.
sort
()
except
Exception
:
print
(
"
Duplicate!
"
)
for
item
in
self
.
transactions_queue
:
if
item
.
priority
==
queue_item
.
priority
and
item
.
proposer
==
queue_item
.
proposer
and
item
.
transaction_message
!=
queue_item
.
transaction_message
:
print
(
queue_item
)
print
(
item
)
raise
Exception
self
.
transactions_queue
.
sort
()
self
.
transactions_id_map
[
transaction_message
.
transaction_ID
]
=
queue_item
transaction_messages
=
{
client_name
:
replace
(
transaction_message
,
receiver
=
client_name
)
...
...
@@ -99,27 +90,9 @@ class TransactionDeliverer:
queue_item
=
_Transaction_Message_Queue_Item
(
proposed_priority
,
self
.
node_name
,
transaction_message
,
1
)
# For debug purposes
"""
for item in self.transactions_queue:
if item.priority == proposed_priority and item.proposer == self.node_name:
print(
"
Comparison FAIL!
"
)
print(queue_item)
print(item)
"""
self
.
transactions_queue
.
append
(
queue_item
)
try
:
self
.
transactions_queue
.
sort
()
except
Exception
:
print
(
"
Duplicate!
"
)
for
item
in
self
.
transactions_queue
:
if
item
.
priority
==
queue_item
.
priority
and
item
.
proposer
==
queue_item
.
proposer
and
item
.
transaction_message
!=
queue_item
.
transaction_message
:
print
(
queue_item
)
print
(
item
)
raise
Exception
self
.
transactions_queue
.
sort
()
self
.
transactions_id_map
[
transaction_message
.
transaction_ID
]
=
queue_item
def
process_proposed_priority_message
(
self
,
proposed_priority_message
:
ProposedPriorityMessage
):
...
...
@@ -129,21 +102,19 @@ class TransactionDeliverer:
(
proposed_priority_message
.
proposed_priority
,
proposed_priority_message
.
sender
)
)
try
:
self
.
transactions_queue
.
sort
()
except
Exception
:
print
(
"
Duplicate!
"
)
for
item
in
self
.
transactions_queue
:
if
item
.
priority
==
queue_item
.
priority
and
item
.
proposer
==
queue_item
.
proposer
and
item
.
transaction_message
!=
queue_item
.
transaction_message
:
print
(
queue_item
)
print
(
item
)
raise
Exception
self
.
transactions_queue
.
sort
()
queue_item
.
priority_confirmations
+=
1
# Plus 1 since client sockets does not include the node itself
if
queue_item
.
priority_confirmations
==
len
(
self
.
client_sockets
)
+
1
:
agreed_priority_message
=
AgreedPriorityMessage
(
str
(
uuid4
()),
self
.
node_name
,
self
.
node_name
,
proposed_priority_message
.
transaction_ID
,
queue_item
.
priority
)
agreed_priority_message
=
AgreedPriorityMessage
(
str
(
uuid4
()),
self
.
node_name
,
self
.
node_name
,
proposed_priority_message
.
transaction_ID
,
queue_item
.
priority
,
queue_item
.
proposer
)
agreed_priority_messages
=
{
client_name
:
replace
(
agreed_priority_message
,
receiver
=
client_name
)
for
client_name
in
self
.
client_sockets
.
keys
()
...
...
@@ -157,20 +128,10 @@ class TransactionDeliverer:
def
process_agreed_priority_message
(
self
,
agreed_priority_message
:
AgreedPriorityMessage
):
queue_item
=
self
.
transactions_id_map
[
agreed_priority_message
.
transaction_ID
]
# TODO - the comparison tie error is introduced here!
# Because we don't also update the proposer!
queue_item
.
priority
=
agreed_priority_message
.
agreed_priority
queue_item
.
proposer
=
agreed_priority_message
.
proposer
try
:
self
.
transactions_queue
.
sort
()
except
Exception
:
print
(
"
Duplicate!
"
)
for
item
in
self
.
transactions_queue
:
if
item
.
priority
==
queue_item
.
priority
and
item
.
proposer
==
queue_item
.
proposer
and
item
.
transaction_message
!=
queue_item
.
transaction_message
:
print
(
queue_item
)
print
(
item
)
raise
Exception
self
.
transactions_queue
.
sort
()
queue_item
.
transaction_message
.
deliverable
=
True
while
len
(
self
.
transactions_queue
)
>
0
and
self
.
transactions_queue
[
0
].
transaction_message
.
deliverable
:
...
...
This diff is collapsed.
Click to expand it.
node.config
+
5
−
4
View file @
44fb8460
3
node1
localhost
4201
node2
localhost
4202
node3
localhost
4203
\ No newline at end of file
4
node1
localhost
4211
node2
localhost
4212
node3
localhost
4213
node4
localhost
4214
\ No newline at end of file
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