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

mon: show io status quickly if no update in a long period #14176

Merged
merged 1 commit into from May 24, 2017

Conversation

Projects
None yet
3 participants
@LiumxNL
Copy link
Contributor

LiumxNL commented Mar 28, 2017

Signed-off-by: Mingxin Liu mingxin@xsky.com

@LiumxNL

This comment has been minimized.

Copy link
Contributor Author

LiumxNL commented Mar 29, 2017

retest this please

@tchaikov tchaikov self-requested a review Apr 4, 2017

@tchaikov
Copy link
Contributor

tchaikov left a comment

lgtm modulo the nit.

@@ -1477,7 +1477,11 @@ void PGMap::update_delta(CephContext *cct,
delta_t -= *last_ts; // take the last timestamp we saw
*last_ts = ts; // @p ts becomes the last timestamp we saw

// calculate a delta, and average over the last 2 deltas.
// adjust delta_t, quick start if there is no update in a long period
if (*result_ts_delta == utime_t())

This comment has been minimized.

Copy link
@tchaikov

tchaikov Apr 12, 2017

Contributor

yeah, it's hard to be accurate in this case.

This comment has been minimized.

Copy link
@tchaikov

tchaikov Apr 12, 2017

Contributor

better off putting

if (result_ts_delta->is_zero()) {
  delta_t = std::min(delta_t, utime_t(2 * g_conf->mon_delta_reset_interval, 0));
}

@LiumxNL LiumxNL force-pushed the LiumxNL:wip-170321 branch from 0a21b4c to bda38b4 Apr 13, 2017

@LiumxNL

This comment has been minimized.

Copy link
Contributor Author

LiumxNL commented Apr 14, 2017

@tchaikov done with your suggestion.

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented Apr 14, 2017

85/166 Test  #92: check-generated.sh ......................***Failed   17.74 sec
Enivronment Variables Already Set
checking ceph-dencoder generated test instances...
numgen type
3 ACLGrant
2 ACLGranteeType
2 ACLOwner
2 ACLPermission
3 AuthMonitor::Incremental
2 BitVector<2>
2 BloomHitSet
2 Capability
24395: copy ctor not supported
24395: copy operator= not supported
24395: copy operator= not supported
24395: copy ctor not supported
2 CompatSet
1 CrushWrapper
2 DBObjectMap::State
2 DBObjectMap::_Header
24395: copy operator= not supported
24395: copy ctor not supported
2 DecayCounter
2 ECSubRead
2 ECSubReadReply
3 ECSubWrite
24395: copy ctor not supported
24395: copy operator= not supported
2 ECSubWriteReply
2 ECUtil::HashInfo
24395: copy ctor not supported
24395: copy operator= not supported
24395: copy ctor not supported
24395: copy operator= not supported
2 ECommitted
1 EExport
2 EFragment
2 EImportFinish
1 EImportStart
1 EMetaBlob
1 EMetaBlob::dirlump
1 EMetaBlob::fullbit
2 EMetaBlob::nullbit
1 EMetaBlob::remotebit
2 EOpen
24395: copy ctor not supported
24395: copy operator= not supported
1 EResetJournal
1 ESession
1 ESessions
1 ESlaveUpdate
1 ESubtreeMap
1 ETableClient
1 ETableServer
1 EUpdate
2 ExplicitHashHitSet
  sorting json output for nondeterministic object
  sorting json output for nondeterministic object
2 ExplicitObjectHitSet
  sorting json output for nondeterministic object
  sorting json output for nondeterministic object
1 FSMap
4 HitSet
  sorting json output for nondeterministic object
  sorting json output for nondeterministic object
  sorting json output for nondeterministic object
  sorting json output for nondeterministic object
8 HitSet::Params
1 InoTable
1 InodeStore
2 JournalPointer
3 Journaler::Header
2 LevelDBStoreStats
1 LogEntry
2 LogEntryKey
1 LogSummary
0 MAuth
0 MAuthReply
0 MCacheExpire
0 MClientCapRelease
0 MClientCaps
0 MClientLease
0 MClientReconnect
0 MClientReply
0 MClientRequest
0 MClientRequestForward
0 MClientSession
0 MClientSnap
0 MCommand
0 MCommandReply
3 MDSCacheObjectInfo
1 MDSMap
2 MDSMap::mds_info_t
0 MDentryLink
0 MDentryUnlink
0 MDirUpdate
0 MDiscover
0 MDiscoverReply
0 MExportCaps
0 MExportCapsAck
0 MExportDir
0 MExportDirAck
0 MExportDirCancel
0 MExportDirDiscover
0 MExportDirDiscoverAck
0 MExportDirFinish
0 MExportDirNotify
0 MExportDirNotifyAck
0 MExportDirPrep
0 MExportDirPrepAck
0 MForward
0 MGetPoolStats
0 MGetPoolStatsReply
0 MHeartbeat
0 MInodeFileCaps
0 MLock
0 MLog
0 MLogAck
0 MMDSBeacon
0 MMDSCacheRejoin
0 MMDSFindIno
0 MMDSFindInoReply
0 MMDSFragmentNotify
0 MMDSLoadTargets
0 MMDSMap
0 MMDSResolve
0 MMDSResolveAck
0 MMDSSlaveRequest
0 MMDSTableRequest
0 MMonCommand
0 MMonCommandAck
0 MMonElection
0 MMonGetMap
0 MMonGetVersion
0 MMonGetVersionReply
0 MMonGlobalID
0 MMonJoin
0 MMonMap
0 MMonPaxos
0 MMonProbe
0 MMonScrub
0 MMonSubscribe
0 MMonSubscribeAck
0 MMonSync
0 MOSDAlive
0 MOSDBoot
0 MOSDFailure
0 MOSDMap
0 MOSDOp
0 MOSDOpReply
0 MOSDPGBackfill
0 MOSDPGCreate
0 MOSDPGInfo
0 MOSDPGLog
0 MOSDPGNotify
0 MOSDPGQuery
0 MOSDPGRemove
0 MOSDPGScan
0 MOSDPGTemp
0 MOSDPGTrim
0 MOSDPing
0 MOSDRepScrub
0 MOSDScrub
0 MOSDSubOp
0 MOSDSubOpReply
0 MPGStats
0 MPGStatsAck
0 MPing
0 MPoolOp
0 MPoolOpReply
0 MRemoveSnaps
0 MRoute
0 MStatfs
0 MStatfsReply
0 MWatchNotify
1 MgrMap
8 MonCap
3 MonMap
1 MonitorDBStore::Op
2 MonitorDBStore::Transaction
2 OSDMap
1 OSDMap::Incremental
3 OSDSuperblock
24395: copy ctor not supported
24395: copy operator= not supported
24395: copy operator= not supported
24395: copy ctor not supported
2 ObjectCacheInfo
2 ObjectMetaInfo
1 ObjectRecoveryInfo
2 ObjectRecoveryProgress
4 ObjectStore::Transaction

The following tests FAILED:
	 92 - check-generated.sh (Failed)

see https://jenkins.ceph.com/job/ceph-pull-requests/22052/console

retest this please.

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented Apr 14, 2017

@LiumxNL could you rebase you change against master for a green jenkins run? if the failure persists, we need to fix it first.

@LiumxNL LiumxNL force-pushed the LiumxNL:wip-170321 branch 2 times, most recently from ccc9697 to 37d9549 Apr 14, 2017

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented Apr 26, 2017

retest this please.

@tchaikov tchaikov self-assigned this Apr 26, 2017

@LiumxNL LiumxNL force-pushed the LiumxNL:wip-170321 branch from 37d9549 to 10dfe47 Apr 26, 2017

@@ -1514,7 +1514,12 @@ void PGMap::update_delta(CephContext *cct,
delta_t -= *last_ts; // take the last timestamp we saw
*last_ts = ts; // @p ts becomes the last timestamp we saw

// calculate a delta, and average over the last 2 deltas.
// adjust delta_t, quick start if there is no update in a long period
if (result_ts_delta->is_zero()) {

This comment has been minimized.

Copy link
@liewegas

liewegas Apr 27, 2017

Member

Why is this condition needed? It seems like you could do the min unconditionally...

This comment has been minimized.

Copy link
@LiumxNL

LiumxNL May 18, 2017

Author Contributor

you are quite right, ty

mon: quick start if no update in a long period
Signed-off-by: Mingxin Liu <mingxin@xsky.com>

@LiumxNL LiumxNL force-pushed the LiumxNL:wip-170321 branch from 10dfe47 to cf022fd May 18, 2017

@LiumxNL

This comment has been minimized.

Copy link
Contributor Author

LiumxNL commented May 19, 2017

@tchaikov sorry for the latency, jenkins is ok now.

@tchaikov tchaikov added the needs-qa label May 19, 2017

@liewegas liewegas merged commit e8fd986 into ceph:master May 24, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.