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

server: remove events log. #733

Merged
merged 1 commit into from Sep 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 0 additions & 80 deletions server/api/event.go

This file was deleted.

2 changes: 0 additions & 2 deletions server/api/router.go
Expand Up @@ -69,8 +69,6 @@ func createRouter(prefix string, svr *server.Server) *mux.Router {
hotStatusHandler := newHotStatusHandler(handler, rd)
router.HandleFunc("/api/v1/hotspot/regions", hotStatusHandler.GetHotRegions).Methods("GET")
router.HandleFunc("/api/v1/hotspot/stores", hotStatusHandler.GetHotStores).Methods("GET")
router.Handle("/api/v1/events", newEventsHandler(svr, rd)).Methods("GET")
router.Handle("/api/v1/feed", newFeedHandler(svr, rd)).Methods("GET")

regionHandler := newRegionHandler(svr, rd)
router.HandleFunc("/api/v1/region/id/{id}", regionHandler.GetRegionByID).Methods("GET")
Expand Down
7 changes: 0 additions & 7 deletions server/cluster.go
Expand Up @@ -637,10 +637,3 @@ func (c *RaftCluster) putConfig(meta *metapb.Cluster) error {
}
return c.cachedCluster.putMeta(meta)
}

// FetchEvents fetches the operator events.
func (c *RaftCluster) FetchEvents(key uint64, all bool) []LogEvent {
c.RLock()
defer c.RUnlock()
return c.coordinator.fetchEvents(key, all)
}
6 changes: 0 additions & 6 deletions server/cluster_worker.go
Expand Up @@ -98,12 +98,6 @@ func (c *RaftCluster) handleReportSplit(request *pdpb.ReportSplitRequest) (*pdpb
originRegion := proto.Clone(right).(*metapb.Region)
originRegion.RegionEpoch = nil
originRegion.StartKey = left.GetStartKey()

// Wrap report split as an Operator, and add it into history cache.
op := newSplitOperator(originRegion, left, right)
c.coordinator.histories.Put(originRegion.GetId(), op)
log.Infof("[region %d] region split, generate new region: %v", originRegion.GetId(), left)
c.coordinator.postEvent(op, evtEnd)

return &pdpb.ReportSplitResponse{}, nil
}
14 changes: 0 additions & 14 deletions server/cluster_worker_test.go
Expand Up @@ -640,18 +640,4 @@ func (s *testClusterWorkerSuite) TestReportSplit(c *C) {

resp := s.reportSplit(c, left, right)
c.Assert(resp, NotNil)

regionID := right.GetId()
value, ok := cluster.coordinator.histories.Get(regionID)
c.Assert(ok, IsTrue)

op := value.(*splitOperator)
c.Assert(op.Left, DeepEquals, left)
c.Assert(op.Right, DeepEquals, right)
c.Assert(op.Origin.GetId(), Equals, regionID)
c.Assert(op.Origin.GetRegionEpoch(), IsNil)
c.Assert(op.Origin.GetStartKey(), BytesEquals, left.GetStartKey())
c.Assert(op.Origin.GetEndKey(), BytesEquals, right.GetEndKey())
c.Assert(op.Origin.GetPeers(), HasLen, 1)
c.Assert(op.Origin.GetPeers()[0], DeepEquals, peer)
}
8 changes: 2 additions & 6 deletions server/coordinator.go
Expand Up @@ -66,11 +66,8 @@ type coordinator struct {
checker *schedule.ReplicaChecker
operators map[uint64]schedule.Operator
schedulers map[string]*scheduleController

histories *cache.LRU
events *cache.FIFO

hbStreams *heartbeatStreams
histories *cache.LRU
hbStreams *heartbeatStreams
}

func newCoordinator(cluster *clusterInfo, opt *scheduleOption, hbStreams *heartbeatStreams) *coordinator {
Expand All @@ -85,7 +82,6 @@ func newCoordinator(cluster *clusterInfo, opt *scheduleOption, hbStreams *heartb
operators: make(map[uint64]schedule.Operator),
schedulers: make(map[string]*scheduleController),
histories: cache.NewLRU(historiesCacheSize),
events: cache.NewFIFO(eventsCacheSize),
hbStreams: hbStreams,
}
}
Expand Down
179 changes: 0 additions & 179 deletions server/event.go

This file was deleted.