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.

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

Disable deadlock detection #1186

Merged

Conversation

winder
Copy link
Contributor

@winder winder commented Aug 16, 2022

Summary

Make sure deadlock detection is turned off when running fast catchup.

@winder winder requested a review from cce August 16, 2022 17:06
@winder winder changed the base branch from develop to release/2.14.0 August 16, 2022 17:06
@winder winder added the bug Something isn't working label Aug 16, 2022
@@ -66,6 +66,7 @@ func CatchupServiceCatchup(ctx context.Context, logger *log.Logger, catchpoint,

start := time.Now()
cfg := config.AutogenLocal
cfg.DeadlockDetection = 0
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this will have any impact.. you need to disable in your indexer main.go or daemon.go at startup time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Startup of what? This the config passed into the service, it doesn't exist until this function.

Copy link
Contributor

Choose a reason for hiding this comment

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

Like this

diff --git a/cmd/algorand-indexer/main.go b/cmd/algorand-indexer/main.go
index c1540fc..dff7626 100644
--- a/cmd/algorand-indexer/main.go
+++ b/cmd/algorand-indexer/main.go
@@ -11,6 +11,7 @@ import (
    "github.com/spf13/cobra/doc"
    "github.com/spf13/viper"

+   "github.com/algorand/go-deadlock"
    bg "github.com/algorand/indexer/cmd/block-generator/core"
    v "github.com/algorand/indexer/cmd/validator/core"
    "github.com/algorand/indexer/config"
@@ -94,6 +95,9 @@ func indexerDbFromFlags(opts idb.IndexerDbOptions) (idb.IndexerDb, chan struct{}
 }

 func init() {
+   // disable go-deadlock detection
+   deadlock.Opts.Disable = true
+
    // Utilities subcommand for more convenient access to useful testing utilities.
    utilsCmd := &cobra.Command{
        Use:   "util",

Copy link
Contributor

Choose a reason for hiding this comment

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

The go-algorand objects you are passing cfg to don't do anything with cfg.DeadlockDetection — this config value (and/or build flag) is checked and set at service start / init time.

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

@winder winder requested a review from cce August 16, 2022 17:15
@@ -17,6 +17,7 @@ import (
"github.com/algorand/indexer/idb"
"github.com/algorand/indexer/idb/dummy"
_ "github.com/algorand/indexer/idb/postgres"
_ "github.com/algorand/indexer/util/disable_deadlock"
Copy link
Contributor

Choose a reason for hiding this comment

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

seems fine, I would prefer explicit vs implicit, but LGTM

@winder winder self-assigned this Aug 16, 2022
@winder winder marked this pull request as ready for review August 16, 2022 18:05
@codecov
Copy link

codecov bot commented Aug 16, 2022

Codecov Report

Merging #1186 (9e33e3b) into release/2.14.0 (777a34d) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@                Coverage Diff                 @@
##           release/2.14.0    #1186      +/-   ##
==================================================
+ Coverage           60.80%   60.81%   +0.01%     
==================================================
  Files                  51       52       +1     
  Lines                8472     8475       +3     
==================================================
+ Hits                 5151     5154       +3     
  Misses               2862     2862              
  Partials              459      459              
Impacted Files Coverage Δ
util/disabledeadlock/disable_deadlock.go 100.00% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@winder winder merged commit b129605 into algorand:release/2.14.0 Aug 16, 2022
@winder winder deleted the will/disable-deadlock-detection branch August 16, 2022 21:05
Eric-Warehime added a commit that referenced this pull request Sep 14, 2022
* Bump version to 2.13.0-rc1

* Bump version to 2.13.0

* Documentation for data directory. (#1125)

Co-authored-by: algobarb <[email protected]>

* Don't lookup big foreign assets. (#1141)

* Revert "Bump version to 2.13.0"

This reverts commit 0a8af61.

* Bump version to 2.13.0

* Fix import performance test runner. (#1133)

* Start on round 1 since round 0 is now computed from the genesis file.
* Wait for indexer processor to exit.
* Better logging for metric collection errors.
* Proper support for data directory.
* New test script for future release automation.

* Revert "Bump version to 2.13.0"

This reverts commit 7915890.

* Bump version to 2.13.0

* test fixes: Submodule updates (#1144)

* Update go-algorand submodule
* Fix test failure due to duplicate txns
* Add new ledger interface method

* Enhancement: remove import validator utility and obsolete ledger for evaluator (#1146)

removing a bunch of code and make the random test pass with the new ledger for evaluator

* Docs: Readme update (#1149)

* Update README header

* Testing: Use tempdir instead of /tmp for e2elive test (#1152)

* Format misc/*.py with `black` (#1153)

* apply black to e2elive.py as well (#1154)

* Enhancement: More information about S3 keys searched for and Dockerfile that uses submodule instead of channel (#1151)

* Eric's Dockerfile improvements
* Update misc/e2elive.py

* Bug-Fix: Implement BlockHdrCached + miscellany (#1162)

* Enhancement: add max int64 checks (#1166)

* state proofs: Indexer Support for State Proofs (#1002)

Adds API support to the Indexer for State Proof Transactions and header fields.

Co-authored-by: Will Winder <[email protected]>

Co-authored-by: Will Winder <[email protected]>

* Bump version to 2.14.0-rc1

* Stop Panics if no config is supplied (#1180)

Give a default config if not supplied to stop panics.

* Fix spec name collisions. (#1182)

* Update go-algorand submodule to v3.9.1-beta (#1185)

* Bump version to 2.14.0-rc2

* Disable deadlock detection (#1186)

* Add support for new block header: TxnRoot SHA256 (#989)

* Accept yaml and yml configuration files. (#1181)

* Fix bug in reveals lookup (#1198)

* Fix bug in reveals lookup (#1198)

* Bump version to 2.14.0-rc3

* add state proof example with high reveal index - from betanet (#1199)

* Devops: Bump go-algorand submodule to v3.9.2-beta (#1203)

* Bump version to 2.14.0-rc4

* enhancement: Clarify REST query parameters for accounts search (#1201)

* update description for /v2/accounts

* cicd: add darwin arm64 support to release script (#1169)

* Bump version to 2.14.0

* Downgrade mockery to prevent incorrect deprecation warning. (#1211)

* Enhancement: update e2e test policy (#1197)

*update e2e test policy

* Fix release 2.14.0 (#1214)

* Accept yaml and yml configuration files. (#1181)

* Fix bug in reveals lookup (#1198)

* add state proof example with high reveal index - from betanet (#1199)

* enhancement: Clarify REST query parameters for accounts search (#1201)

* update description for /v2/accounts

* cicd: add darwin arm64 support to release script (#1169)

* Downgrade mockery to prevent incorrect deprecation warning. (#1211)

* Enhancement: update e2e test policy (#1197)

*update e2e test policy

* Update test expected value: transaction root sha256

Co-authored-by: AlgoStephenAkiki <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>
Co-authored-by: algoidan <[email protected]>
Co-authored-by: shiqizng <[email protected]>
Co-authored-by: algolucky <[email protected]>
Co-authored-by: Will Winder <[email protected]>

Co-authored-by: DevOps Service <[email protected]>
Co-authored-by: Will Winder <[email protected]>
Co-authored-by: algobarb <[email protected]>
Co-authored-by: Barbara Poon <[email protected]>
Co-authored-by: Zeph Grunschlag <[email protected]>
Co-authored-by: shiqizng <[email protected]>
Co-authored-by: AlgoStephenAkiki <[email protected]>
Co-authored-by: John Lee <[email protected]>
Co-authored-by: Or Aharonee <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>
Co-authored-by: algoidan <[email protected]>
Co-authored-by: algolucky <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants