good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
Erigon
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
Harbor 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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
a
Erigon
Commits
cacc4c7e
Unverified
Commit
cacc4c7e
authored
Aug 15, 2021
by
Alex Sharov
Committed by
GitHub
Aug 15, 2021
Browse files
Options
Downloads
Patches
Plain Diff
fix integration trie nil pointer (#2533)
* fix integration trie * fix integration trie
parent
5278ef42
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmd/integration/commands/snapshot_check.go
+1
-1
1 addition, 1 deletion
cmd/integration/commands/snapshot_check.go
cmd/integration/commands/stages.go
+5
-2
5 additions, 2 deletions
cmd/integration/commands/stages.go
with
6 additions
and
3 deletions
cmd/integration/commands/snapshot_check.go
+
1
−
1
View file @
cacc4c7e
...
@@ -264,7 +264,7 @@ func snapshotCheck(ctx context.Context, db kv.RwDB, isNew bool, tmpDir string) (
...
@@ -264,7 +264,7 @@ func snapshotCheck(ctx context.Context, db kv.RwDB, isNew bool, tmpDir string) (
stage6
:=
stage
(
sync
,
tx
,
nil
,
stages
.
IntermediateHashes
)
stage6
:=
stage
(
sync
,
tx
,
nil
,
stages
.
IntermediateHashes
)
stage6
.
BlockNumber
=
blockNumber
-
1
stage6
.
BlockNumber
=
blockNumber
-
1
log
.
Info
(
"Stage6"
,
"progress"
,
stage6
.
BlockNumber
)
log
.
Info
(
"Stage6"
,
"progress"
,
stage6
.
BlockNumber
)
if
_
,
err
=
stagedsync
.
SpawnIntermediateHashesStage
(
stage5
,
nil
/* Unwinder */
,
tx
,
stagedsync
.
StageTrieCfg
(
db
,
true
,
true
,
tmpDir
),
ctx
);
err
!=
nil
{
if
_
,
err
=
stagedsync
.
SpawnIntermediateHashesStage
(
stage5
,
sync
/* Unwinder */
,
tx
,
stagedsync
.
StageTrieCfg
(
db
,
true
,
true
,
tmpDir
),
ctx
);
err
!=
nil
{
log
.
Error
(
"Error on ih"
,
"err"
,
err
,
"block"
,
blockNumber
)
log
.
Error
(
"Error on ih"
,
"err"
,
err
,
"block"
,
blockNumber
)
return
fmt
.
Errorf
(
"spawnIntermediateHashesStage %w"
,
err
)
return
fmt
.
Errorf
(
"spawnIntermediateHashesStage %w"
,
err
)
}
}
...
...
This diff is collapsed.
Click to expand it.
cmd/integration/commands/stages.go
+
5
−
2
View file @
cacc4c7e
...
@@ -498,7 +498,10 @@ func stageTrie(db kv.RwDB, ctx context.Context) error {
...
@@ -498,7 +498,10 @@ func stageTrie(db kv.RwDB, ctx context.Context) error {
defer
tx
.
Rollback
()
defer
tx
.
Rollback
()
if
reset
{
if
reset
{
return
stagedsync
.
ResetIH
(
tx
)
if
err
:=
stagedsync
.
ResetIH
(
tx
);
err
!=
nil
{
return
err
}
return
tx
.
Commit
()
}
}
execStage
:=
stage
(
sync
,
tx
,
nil
,
stages
.
Execution
)
execStage
:=
stage
(
sync
,
tx
,
nil
,
stages
.
Execution
)
s
:=
stage
(
sync
,
tx
,
nil
,
stages
.
IntermediateHashes
)
s
:=
stage
(
sync
,
tx
,
nil
,
stages
.
IntermediateHashes
)
...
@@ -529,7 +532,7 @@ func stageTrie(db kv.RwDB, ctx context.Context) error {
...
@@ -529,7 +532,7 @@ func stageTrie(db kv.RwDB, ctx context.Context) error {
return
err
return
err
}
}
}
else
{
}
else
{
if
_
,
err
:=
stagedsync
.
SpawnIntermediateHashesStage
(
s
,
nil
/* Unwinder */
,
tx
,
cfg
,
ctx
);
err
!=
nil
{
if
_
,
err
:=
stagedsync
.
SpawnIntermediateHashesStage
(
s
,
sync
/* Unwinder */
,
tx
,
cfg
,
ctx
);
err
!=
nil
{
return
err
return
err
}
}
}
}
...
...
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