Skip to content

Commit

Permalink
Merge eb6609c into 04170fa
Browse files Browse the repository at this point in the history
  • Loading branch information
nolouch committed Dec 27, 2018
2 parents 04170fa + eb6609c commit fcbbcf5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions server/core/levedb_kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"github.com/pkg/errors"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/util"

log "github.com/sirupsen/logrus"
)

type leveldbKV struct {
Expand Down Expand Up @@ -54,6 +56,7 @@ func (kv *leveldbKV) LoadRange(startKey, endKey string, limit int) ([]string, er
count++
}
iter.Release()
log.Infof("leveldb load range %d items", len(values))
return values, nil
}

Expand Down
2 changes: 2 additions & 0 deletions server/core/region_kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ func loadRegions(kv KVBase, regions *RegionsInfo) error {
nextID = region.GetId() + 1
overlaps := regions.SetRegion(NewRegionInfo(region, nil))
for _, item := range overlaps {
log.Warnf("exsist overlap item %+v", item)
if err := deleteRegion(kv, item); err != nil {
return err
}
Expand All @@ -164,6 +165,7 @@ func (kv *RegionKV) FlushRegion() error {
}

func (kv *RegionKV) flush() error {
log.Infof("regionkv persist %d items", len(kv.batchRegions))
if err := kv.SaveRegions(kv.batchRegions); err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions server/region_syncer/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ func (s *RegionSyncer) StartSyncWithLeader(addr string) {
}
for _, r := range resp.GetRegions() {
err = s.server.GetStorage().SaveRegion(r)
log.Debugf("%s recv region %d", s.server.Name(), r.GetId())
if err == nil {
s.history.Record(core.NewRegionInfo(r, nil))
}
Expand Down

0 comments on commit fcbbcf5

Please sign in to comment.