Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
d561430b
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d561430b
编写于
6月 03, 2010
作者:
R
Robert Haas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
On clean shutdown during recovery, don't warn about possible corruption.
Fujii Masao. Review by Heikki Linnakangas and myself.
上级
f0c437cf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
3 deletion
+20
-3
src/backend/access/transam/xlog.c
src/backend/access/transam/xlog.c
+15
-1
src/bin/pg_controldata/pg_controldata.c
src/bin/pg_controldata/pg_controldata.c
+3
-1
src/include/catalog/pg_control.h
src/include/catalog/pg_control.h
+2
-1
未找到文件。
src/backend/access/transam/xlog.c
浏览文件 @
d561430b
...
...
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.41
5 2010/06/02 09:28:44 heikki
Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.41
6 2010/06/03 03:19:59 rhaas
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -5661,6 +5661,10 @@ StartupXLOG(void)
ereport
(
LOG
,
(
errmsg
(
"database system was shut down at %s"
,
str_time
(
ControlFile
->
time
))));
else
if
(
ControlFile
->
state
==
DB_SHUTDOWNED_IN_RECOVERY
)
ereport
(
LOG
,
(
errmsg
(
"database system was shut down in recovery at %s"
,
str_time
(
ControlFile
->
time
))));
else
if
(
ControlFile
->
state
==
DB_SHUTDOWNING
)
ereport
(
LOG
,
(
errmsg
(
"database system shutdown was interrupted; last known up at %s"
,
...
...
@@ -7548,6 +7552,14 @@ CreateRestartPoint(int flags)
lastCheckPoint
.
redo
.
xlogid
,
lastCheckPoint
.
redo
.
xrecoff
)));
UpdateMinRecoveryPoint
(
InvalidXLogRecPtr
,
true
);
if
(
flags
&
CHECKPOINT_IS_SHUTDOWN
)
{
LWLockAcquire
(
ControlFileLock
,
LW_EXCLUSIVE
);
ControlFile
->
state
=
DB_SHUTDOWNED_IN_RECOVERY
;
ControlFile
->
time
=
(
pg_time_t
)
time
(
NULL
);
UpdateControlFile
();
LWLockRelease
(
ControlFileLock
);
}
LWLockRelease
(
CheckpointLock
);
return
false
;
}
...
...
@@ -7585,6 +7597,8 @@ CreateRestartPoint(int flags)
ControlFile
->
checkPoint
=
lastCheckPointRecPtr
;
ControlFile
->
checkPointCopy
=
lastCheckPoint
;
ControlFile
->
time
=
(
pg_time_t
)
time
(
NULL
);
if
(
flags
&
CHECKPOINT_IS_SHUTDOWN
)
ControlFile
->
state
=
DB_SHUTDOWNED_IN_RECOVERY
;
UpdateControlFile
();
}
LWLockRelease
(
ControlFileLock
);
...
...
src/bin/pg_controldata/pg_controldata.c
浏览文件 @
d561430b
...
...
@@ -6,7 +6,7 @@
* copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
* licence: BSD
*
* $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.
49 2010/04/28 19:38:49 tgl
Exp $
* $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.
50 2010/06/03 03:20:00 rhaas
Exp $
*/
/*
...
...
@@ -57,6 +57,8 @@ dbState(DBState state)
return
_
(
"starting up"
);
case
DB_SHUTDOWNED
:
return
_
(
"shut down"
);
case
DB_SHUTDOWNED_IN_RECOVERY
:
return
_
(
"shut down in recovery"
);
case
DB_SHUTDOWNING
:
return
_
(
"shutting down"
);
case
DB_IN_CRASH_RECOVERY
:
...
...
src/include/catalog/pg_control.h
浏览文件 @
d561430b
...
...
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.5
4 2010/04/28 16:10:43 heikki
Exp $
* $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.5
5 2010/06/03 03:20:00 rhaas
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -65,6 +65,7 @@ typedef enum DBState
{
DB_STARTUP
=
0
,
DB_SHUTDOWNED
,
DB_SHUTDOWNED_IN_RECOVERY
,
DB_SHUTDOWNING
,
DB_IN_CRASH_RECOVERY
,
DB_IN_ARCHIVE_RECOVERY
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录