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

osd/PG: conditionally retry on receiving pg-notify when Primary is Incomplete #13942

Merged
merged 4 commits into from Mar 22, 2017

Conversation

Projects
None yet
4 participants
@xiexingguo
Member

xiexingguo commented Mar 13, 2017

If the pg info sent by the peer is identical to ours, or it is from a down OSD,
we can simply ignore and no action shall be taken.

Signed-off-by: xie xingguo xie.xingguo@zte.com.cn

@liewegas liewegas changed the title from OSD: conditionally retry on receving pg-notify when Primary is Incomplete to osd/PG: conditionally retry on receving pg-notify when Primary is Incomplete Mar 13, 2017

notevt.from, notevt.notify.info, notevt.notify.epoch_sent);
// try again!
if (pg->proc_replica_info(
notevt.from, notevt.notify.info, notevt.notify.epoch_sent))

This comment has been minimized.

@liewegas

liewegas Mar 13, 2017

Member

missing {

/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/PG.cc:7770:5: error: expected unqualified-id before ‘else’
} else {
^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/osd/PG.cc:7773:1: error: expected declaration before ‘}’ token
}
^

@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Mar 14, 2017

Sorry for doing this in such a hurry. Jenkins is happy now:-)

@xiexingguo xiexingguo changed the title from osd/PG: conditionally retry on receving pg-notify when Primary is Incomplete to osd/PG: conditionally retry on receiving pg-notify when Primary is Incomplete Mar 14, 2017

xiexingguo added some commits Mar 13, 2017

OSD: conditionally retry on receiving pg-notify when Primary is Incom…
…plete

If the pg info sent by the peer is identical to ours, or it is from a down OSD,
we can simply ignore and no action shall be taken.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
osd/PG: let proc_replica_info() do sanity check
As proc_replica_info() will do the check internally.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
osd/PG: remove dup is_primary() check
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
osd/PG: kill PG_STATE_REPLAY
This replay state of PG is not functionable and
hence should not be made visible to user.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
@xiexingguo

This comment has been minimized.

Member

xiexingguo commented Mar 20, 2017

Append some more cleanups.

@liewegas Can you take a quick glance at this again?

@liewegas liewegas added the needs-qa label Mar 20, 2017

@tchaikov tchaikov merged commit 3ffa869 into ceph:master Mar 22, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@xiexingguo xiexingguo deleted the xiexingguo:wip-cleanup-proc-repinfo branch Mar 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment