ddl: Add interval to log (pingcap#3422)

linia · Jun 8, 2017 · b8972bc · b8972bc
1 parent 72981fd
commit b8972bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ddl/syncer.go b/ddl/syncer.go
@@ -158,6 +158,8 @@ func isContextFinished(err error) bool {
 // OwnerCheckAllVersions implements SchemaSyncer.OwnerCheckAllVersions interface.
 func (s *schemaVersionSyncer) OwnerCheckAllVersions(ctx goctx.Context, latestVer int64) error {
 	time.Sleep(CheckVersFirstWaitTime)
+	notMatchVerCnt := 0
+	intervalCnt := int(time.Second / checkVersInterval)
 	updatedMap := make(map[string]struct{})
 	for {
 		select {
@@ -188,8 +190,12 @@ func (s *schemaVersionSyncer) OwnerCheckAllVersions(ctx goctx.Context, latestVer
 				break
 			}
 			if int64(ver) != latestVer {
-				log.Infof("[syncer] check all versions, ddl %s current ver %v, latest version %v", kv.Key, ver, latestVer)
+				if notMatchVerCnt%intervalCnt == 0 {
+					log.Infof("[syncer] check all versions, ddl %s current ver %v, latest version %v",
+						kv.Key, ver, latestVer)
+				}
 				succ = false
+				notMatchVerCnt++
 				break
 			}
 			updatedMap[string(kv.Key)] = struct{}{}

diff --git a/tidb.go b/tidb.go
@@ -66,7 +66,7 @@ func (dm *domainMap) Get(store kv.Storage) (d *domain.Domain, err error) {
 		statisticLease = statsLease
 	}
 	err = util.RunWithRetry(defaultMaxRetries, retryInterval, func() (retry bool, err1 error) {
-		log.Infof("store %v new domain, ddl lease %v, stats lease", store.UUID(), ddlLease, statisticLease)
+		log.Infof("store %v new domain, ddl lease %v, stats lease %d", store.UUID(), ddlLease, statisticLease)
 		factory := createSessionFunc(store)
 		d, err1 = domain.NewDomain(store, ddlLease, statisticLease, factory)
 		return true, errors.Trace(err1)