Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
bb418a43
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bb418a43
编写于
7月 01, 2015
作者:
J
Jeffrey Wilcke
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1370 from obscuren/force-checkpoint
core, cmd/geth: recover by number
上级
2e5242f9
29ab1fa8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
2 deletion
+34
-2
cmd/geth/main.go
cmd/geth/main.go
+24
-0
core/chain_manager.go
core/chain_manager.go
+10
-2
未找到文件。
cmd/geth/main.go
浏览文件 @
bb418a43
...
...
@@ -39,6 +39,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/comms"
...
...
@@ -68,6 +69,15 @@ func init() {
app
.
Action
=
run
app
.
HideVersion
=
true
// we have a command to print the version
app
.
Commands
=
[]
cli
.
Command
{
{
Action
:
blockRecovery
,
Name
:
"recover"
,
Usage
:
"attempts to recover a corrupted database by setting a new block head by number"
,
Description
:
`
The recover commands will attempt to read out the last
block based on that.
`
,
},
blocktestCommand
,
importCommand
,
exportCommand
,
...
...
@@ -439,6 +449,20 @@ func unlockAccount(ctx *cli.Context, am *accounts.Manager, account string) (pass
return
}
func
blockRecovery
(
ctx
*
cli
.
Context
)
{
num
:=
ctx
.
Args
()
.
First
()
if
len
(
ctx
.
Args
())
<
1
{
glog
.
Fatal
(
"recover requires block number"
)
}
cfg
:=
utils
.
MakeEthConfig
(
ClientIdentifier
,
nodeNameVersion
,
ctx
)
ethereum
,
err
:=
eth
.
New
(
cfg
)
if
err
!=
nil
{
utils
.
Fatalf
(
"%v"
,
err
)
}
ethereum
.
ChainManager
()
.
Recover
(
common
.
String2Big
(
num
)
.
Uint64
())
}
func
startEth
(
ctx
*
cli
.
Context
,
eth
*
eth
.
Ethereum
)
{
// Start Ethereum itself
...
...
core/chain_manager.go
浏览文件 @
bb418a43
...
...
@@ -238,6 +238,16 @@ func (self *ChainManager) setTransState(statedb *state.StateDB) {
self
.
transState
=
statedb
}
func
(
bc
*
ChainManager
)
Recover
(
num
uint64
)
{
block
:=
bc
.
GetBlockByNumber
(
num
)
if
block
!=
nil
{
bc
.
insert
(
block
)
glog
.
Infof
(
"Recovery succesful. New HEAD %x
\n
"
,
block
.
Hash
())
}
else
{
glog
.
Fatalln
(
"Recovery failed"
)
}
}
func
(
bc
*
ChainManager
)
recover
()
bool
{
data
,
_
:=
bc
.
blockDb
.
Get
([]
byte
(
"checkpoint"
))
if
len
(
data
)
!=
0
{
...
...
@@ -261,8 +271,6 @@ func (bc *ChainManager) setLastState() {
if
len
(
data
)
!=
0
{
block
:=
bc
.
GetBlock
(
common
.
BytesToHash
(
data
))
if
block
!=
nil
{
bc
.
blockDb
.
Put
([]
byte
(
"checkpoint"
),
block
.
Hash
()
.
Bytes
())
bc
.
currentBlock
=
block
bc
.
lastBlockHash
=
block
.
Hash
()
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录