Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Timeout #38

Merged
merged 23 commits into from
Mar 18, 2020
Merged

Timeout #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ec63e48
Added select timeouts for unlynx protocols
JoaoAndreSa Mar 10, 2020
b0d3547
Added select timeouts for unlynx protocols/utils
JoaoAndreSa Mar 10, 2020
66925ca
Added select timeouts for unlynx services and simulations
JoaoAndreSa Mar 10, 2020
17479ba
Updated libraries except Onet
JoaoAndreSa Mar 10, 2020
2c8b8bd
Removed break and re-adding race flag
JoaoAndreSa Mar 11, 2020
3281921
Re-added simulation tests
JoaoAndreSa Mar 11, 2020
3dcc5b4
Changed timeouts to use os.Getenv
JoaoAndreSa Mar 11, 2020
abbe277
Added init() for timeout
JoaoAndreSa Mar 11, 2020
3a7f339
Fixed init() in constants.go mistake in condition
JoaoAndreSa Mar 11, 2020
5564657
Added warning while parsing timeout
JoaoAndreSa Mar 11, 2020
3031cda
Removed error condition around tn.SetConfig
JoaoAndreSa Mar 11, 2020
31c25d5
Removed unecessary if condition when sending empty structs
JoaoAndreSa Mar 11, 2020
8861342
Switched from errors.new to fmt.Errorf
JoaoAndreSa Mar 11, 2020
f3812c3
Remove the isLeaf condition for the SendToChildren call
JoaoAndreSa Mar 11, 2020
5bc1e5d
Changed TIMEOUT constant to DEFAULT_TIMEOUT
JoaoAndreSa Mar 12, 2020
186b6f4
Fixed go lint warning
JoaoAndreSa Mar 12, 2020
8563eee
Revert name to TIMEOUT because of golang naming convention (to avoid …
JoaoAndreSa Mar 12, 2020
a4d36eb
Cleaned some of the tmp variables
JoaoAndreSa Mar 12, 2020
c5dddb8
Corrected if negative conditions
JoaoAndreSa Mar 12, 2020
7f37465
Added error condition of tn.SetConfig for debug
JoaoAndreSa Mar 12, 2020
6340084
Fixed tn.SetConfig bug
JoaoAndreSa Mar 12, 2020
e9c05b5
Merge branch 'dev' of https://github.com/ldsec/unlynx into timeout
JoaoAndreSa Mar 12, 2020
e5509ba
Reverted if conditions to the correct way
JoaoAndreSa Mar 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
package libunlynx

import (
"os"
"sync"
"time"

"go.dedis.ch/onet/v3/simul/monitor"
)

func init() {
tmp, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
TIMEOUT = tmp
Copy link
Contributor

@ineiti ineiti Mar 11, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last comment:

if len(os.Getenv("MEDCO_TIMEOUT") > 0 {
  log.Warn("Couldn't parse MEDCO_TIMEOUT")
}

This will save you hours later on ;)

Copy link
Contributor Author

@JoaoAndreSa JoaoAndreSa Mar 11, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added it in 5564657
However now that I updated to the new onet version 3.1.1 the error with the "E : overlay.go:613 (v3.(*Overlay).nodeDelete) - Error while closing node: Can't shutdown empty ProtocolInstance:" pops way more often (TestServiceClearAttr). Do you know what changed with this new 3.1 version of Onet?

Screenshot 2020-03-11 at 14 42 22

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It disappears if I remove the error condition when calling tn.SetConfig()

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have a simple test-case that I can run to trigger it?

And what do you mean by "removing the error condition when calling tn.SetConfig()"?

Copy link
Contributor Author

@JoaoAndreSa JoaoAndreSa Mar 12, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ineiti see here #38 (comment)

^TestServiceClearAttr$ in github.com/ldsec/unlynx/services

I mean this

tn.SetConfig(conf)

instead of

if err := tn.SetConfig(conf); err != nil {
    return nil, xerrors.Errorf("couldn't set config: %+v", err)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed #38 (comment)

}
}

// Global Variables
//______________________________________________________________________________________________________________________

Expand Down
8 changes: 1 addition & 7 deletions protocols/collective_aggregation_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package protocolsunlynx

import (
"errors"
"os"
"sync"
"time"

Expand Down Expand Up @@ -197,19 +196,14 @@ func (p *CollectiveAggregationProtocol) Dispatch() error {

// Announce forwarding down the tree.
func (p *CollectiveAggregationProtocol) aggregationAnnouncementPhase() error {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

select {
case dataReferenceMessage := <-p.DataReferenceChannel:
if !p.IsLeaf() {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unneded if, SendToChildren when having none should work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

31c25d5

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arf, I misexplained it; the if !p.IsLeaf() is unnecessary, as a Leaf sending to it's children is a NOP.
And you're droping the error here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh I did not get it :P
Ok it's fixed: f3812c3

if err := p.SendToChildren(&dataReferenceMessage.DataReferenceMessage); err != nil {
return errors.New("Error sending <DataReferenceMessage>:" + err.Error())
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use the new fmt.Errorf when returning error (it will also keep the stacktrace).

Suggested change
return errors.New("Error sending <DataReferenceMessage>:" + err.Error())
return fmt.Errorf("Error sending <DataReferenceMessage>: %v", err)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

switched everywhere to fmt.Errorf: 8861342

}
}
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <dataReferenceMessage> on time.")
}
return nil
Expand Down
12 changes: 3 additions & 9 deletions protocols/deterministic_tagging_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package protocolsunlynx

import (
"errors"
"os"
"sync"
"time"

Expand Down Expand Up @@ -155,21 +154,16 @@ func (p *DeterministicTaggingProtocol) Start() error {
func (p *DeterministicTaggingProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

//************ ----- first round, add value derivated from ephemeral secret to message ---- ********************
var deterministicTaggingTargetBytesBef deterministicTaggingBytesStruct
select {
case deterministicTaggingTargetBytesBef = <-p.PreviousNodeInPathChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <deterministicTaggingTargetBytesBef> (first round) on time.")
}

deterministicTaggingTargetBef := DeterministicTaggingMessage{Data: make([]libunlynx.CipherText, 0)}
err = deterministicTaggingTargetBef.FromBytes(deterministicTaggingTargetBytesBef.Data)
err := deterministicTaggingTargetBef.FromBytes(deterministicTaggingTargetBytesBef.Data)
if err != nil {
return err
}
Expand Down Expand Up @@ -217,7 +211,7 @@ func (p *DeterministicTaggingProtocol) Dispatch() error {
var deterministicTaggingTargetBytes deterministicTaggingBytesStruct
select {
case deterministicTaggingTargetBytes = <-p.PreviousNodeInPathChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <deterministicTaggingTargetBytes> (second round) on time.")
}

Expand Down
8 changes: 1 addition & 7 deletions protocols/key_switching_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package protocolsunlynx

import (
"errors"
"os"
"time"

"github.com/ldsec/unlynx/lib"
Expand Down Expand Up @@ -231,15 +230,10 @@ func (p *KeySwitchingProtocol) Dispatch() error {

// Announce forwarding down the tree.
func (p *KeySwitchingProtocol) announcementKSPhase() (kyber.Point, []kyber.Point, error) {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var dataReferenceMessage DownBytesStruct
select {
case dataReferenceMessage = <-p.DownChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return nil, nil, errors.New(p.ServerIdentity().String() + "didn't get the <dataReferenceMessage> on time.")
}

Expand Down
9 changes: 2 additions & 7 deletions protocols/shuffling+ddt_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,17 @@ func (p *ShufflingPlusDDTProtocol) Start() error {
func (p *ShufflingPlusDDTProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var shufflingPlusDDTBytesMessageLength shufflingPlusDDTBytesLengthStruct
select {
case shufflingPlusDDTBytesMessageLength = <-p.LengthNodeChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <shufflingPlusDDTBytesMessageLength> on time.")
}

var tmp shufflingPlusDDTBytesStruct
select {
case tmp = <-p.PreviousNodeInPathChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <tmp> on time.")
}

Expand Down
10 changes: 2 additions & 8 deletions protocols/shuffling_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package protocolsunlynx

import (
"errors"
"os"
"time"

"github.com/ldsec/unlynx/lib"
Expand Down Expand Up @@ -188,22 +187,17 @@ func (p *ShufflingProtocol) Start() error {
func (p *ShufflingProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var shufflingBytesMessageLength shufflingBytesLengthStruct
select {
case shufflingBytesMessageLength = <-p.LengthNodeChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <shufflingBytesMessageLength> on time.")
}

var tmp shufflingBytesStruct
select {
case tmp = <-p.PreviousNodeInPathChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <tmp> on time.")
}

Expand Down
8 changes: 1 addition & 7 deletions protocols/utils/addrm_server_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package protocolsunlynxutils

import (
"errors"
"os"
"sync"
"time"

Expand Down Expand Up @@ -94,15 +93,10 @@ func (p *AddRmServerProtocol) Start() error {
func (p *AddRmServerProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var finalResultMessage []libunlynx.CipherText
select {
case finalResultMessage = <-finalResultAddrm:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
}

Expand Down
8 changes: 1 addition & 7 deletions protocols/utils/local_aggregation_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/ldsec/unlynx/lib/aggregation"
"go.dedis.ch/onet/v3"
"go.dedis.ch/onet/v3/log"
"os"
"time"
)

Expand Down Expand Up @@ -85,15 +84,10 @@ func (p *LocalAggregationProtocol) Start() error {
func (p *LocalAggregationProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var finalResultMessage map[libunlynx.GroupingKey]libunlynx.FilteredResponse
select {
case finalResultMessage = <-finalResultAggr:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
}

Expand Down
8 changes: 1 addition & 7 deletions protocols/utils/local_clear_aggregation_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/ldsec/unlynx/lib/store"
"go.dedis.ch/onet/v3"
"go.dedis.ch/onet/v3/log"
"os"
"time"
)

Expand Down Expand Up @@ -59,15 +58,10 @@ func (p *LocalClearAggregationProtocol) Start() error {
func (p *LocalClearAggregationProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var finalResultMessage []libunlynx.DpClearResponse
select {
case finalResultMessage = <-finalResultClearAggr:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
}

Expand Down
8 changes: 1 addition & 7 deletions protocols/utils/proofs_verification_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/ldsec/unlynx/lib/shuffle"
"go.dedis.ch/onet/v3"
"go.dedis.ch/onet/v3/log"
"os"
"time"
)

Expand Down Expand Up @@ -110,15 +109,10 @@ func (p *ProofsVerificationProtocol) Start() error {
func (p *ProofsVerificationProtocol) Dispatch() error {
defer p.Done()

timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

var finalResultMessage []bool
select {
case finalResultMessage = <-finalResult:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
}

Expand Down
36 changes: 5 additions & 31 deletions services/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package servicesunlynx

import (
"errors"
"os"
"strconv"
"time"

Expand Down Expand Up @@ -715,11 +714,6 @@ func (s *Service) StartService(targetSurvey SurveyID, root bool) error {

// ShufflingPhase performs the shuffling of the ClientResponses
func (s *Service) ShufflingPhase(targetSurvey SurveyID) error {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

survey, err := s.getSurvey(targetSurvey)
if err != nil {
return err
Expand All @@ -738,7 +732,7 @@ func (s *Service) ShufflingPhase(targetSurvey SurveyID) error {
var tmpShufflingResult []libunlynx.CipherVector
select {
case tmpShufflingResult = <-pi.(*protocolsunlynx.ShufflingProtocol).FeedbackChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(s.ServerIdentity().String() + "didn't get the <tmpShufflingResult> on time.")
}

Expand All @@ -755,11 +749,6 @@ func (s *Service) ShufflingPhase(targetSurvey SurveyID) error {

// TaggingPhase performs the private grouping on the currently collected data.
func (s *Service) TaggingPhase(targetSurvey SurveyID) error {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

survey, err := s.getSurvey(targetSurvey)
if err != nil {
return err
Expand All @@ -778,7 +767,7 @@ func (s *Service) TaggingPhase(targetSurvey SurveyID) error {
var tmpDeterministicTaggingResult []libunlynx.DeterministCipherText
select {
case tmpDeterministicTaggingResult = <-pi.(*protocolsunlynx.DeterministicTaggingProtocol).FeedbackChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(s.ServerIdentity().String() + "didn't get the <tmpDeterministicTaggingResult> on time.")
}

Expand Down Expand Up @@ -809,11 +798,6 @@ func (s *Service) TaggingPhase(targetSurvey SurveyID) error {

// AggregationPhase performs the per-group aggregation on the currently grouped data.
func (s *Service) AggregationPhase(targetSurvey SurveyID) error {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

pi, err := s.StartProtocol(protocolsunlynx.CollectiveAggregationProtocolName, targetSurvey)
if err != nil {
return err
Expand All @@ -822,7 +806,7 @@ func (s *Service) AggregationPhase(targetSurvey SurveyID) error {
var cothorityAggregatedData protocolsunlynx.CothorityAggregatedData
select {
case cothorityAggregatedData = <-pi.(*protocolsunlynx.CollectiveAggregationProtocol).FeedbackChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(s.ServerIdentity().String() + "didn't get the <cothorityAggregatedData> on time.")
}

Expand All @@ -838,11 +822,6 @@ func (s *Service) AggregationPhase(targetSurvey SurveyID) error {

// DROPhase shuffles the list of noise values.
func (s *Service) DROPhase(targetSurvey SurveyID) error {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

pi, err := s.StartProtocol(protocolsunlynx.DROProtocolName, targetSurvey)
if err != nil {
return err
Expand All @@ -856,7 +835,7 @@ func (s *Service) DROPhase(targetSurvey SurveyID) error {
var tmpShufflingResult []libunlynx.CipherVector
select {
case tmpShufflingResult = <-pi.(*protocolsunlynx.ShufflingProtocol).FeedbackChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(s.ServerIdentity().String() + "didn't get the <tmpShufflingResult> on time.")
}

Expand All @@ -869,11 +848,6 @@ func (s *Service) DROPhase(targetSurvey SurveyID) error {

// KeySwitchingPhase performs the switch to the querier's key on the currently aggregated data.
func (s *Service) KeySwitchingPhase(targetSurvey SurveyID) error {
timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
if err != nil {
timeout = libunlynx.TIMEOUT
}

pi, err := s.StartProtocol(protocolsunlynx.KeySwitchingProtocolName, targetSurvey)
if err != nil {
return err
Expand All @@ -887,7 +861,7 @@ func (s *Service) KeySwitchingPhase(targetSurvey SurveyID) error {
var tmpKeySwitchedAggregatedResponses libunlynx.CipherVector
select {
case tmpKeySwitchedAggregatedResponses = <-pi.(*protocolsunlynx.KeySwitchingProtocol).FeedbackChannel:
case <-time.After(timeout):
case <-time.After(libunlynx.TIMEOUT):
return errors.New(s.ServerIdentity().String() + "didn't get the <tmpKeySwitchedAggregatedResponses> on time.")
}

Expand Down