wp

database/api.go

@@ -84,7 +84,7 @@ func (s *Database) processRequest(conn net.Conn, r *bufreader.BufferedReader) (e
 		if err != nil {
 			return fmt.Errorf("proto.ReadAddMetricReq: %s", err)
 		}
-		fmt.Println("ReadAddMetricReq:", req)
+		//fmt.Println("ReadAddMetricReq:", req)
 		reply(conn, s.AddMetric(req))
 
 	case proto.TypeDeleteMetric:
@@ -534,8 +534,11 @@ func (s *Database) rangeScan(req rangeScanReq) error {
 			LastPageNo:     result.LastPageNo,
 			Since:          req.Since,
 		})
-		//s.metricRUnlock(req.MetricID) fix release unlock
+		s.workerInbox.Push(worker.ReleaseRLock{
+			MetricID: req.MetricID,
+		})
 		if err != nil {
+			s.logger.Printf("ContinueRangeScan: %s\n", err)
 			reply(req.Conn, proto.ErrUnexpected)
 		} else {
 			req.ResponseWriter.Close()
@@ -550,8 +553,11 @@ func (s *Database) rangeScan(req rangeScanReq) error {
 			LastPageNo:     result.LastPageNo,
 			IsDataPage:     result.IsDataPage,
 		})
-		//s.metricRUnlock(req.MetricID) // fix release
+		s.workerInbox.Push(worker.ReleaseRLock{
+			MetricID: req.MetricID,
+		})
 		if err != nil {
+			s.logger.Printf("RangeScan: %s\n", err)
 			reply(req.Conn, proto.ErrUnexpected)
 		} else {
 			req.ResponseWriter.Close()
@@ -595,8 +601,11 @@ func (s *Database) fullScan(req fullScanReq) error {
 			ResponseWriter: req.ResponseWriter,
 			LastPageNo:     result.LastPageNo,
 		})
-		//s.worker.AddJobToQueue(req.MetricID) // FIX release rlock
+		s.workerInbox.Push(worker.ReleaseRLock{
+			MetricID: req.MetricID,
+		})
 		if err != nil {
+			s.logger.Printf("ContinueFullScan: %s\n", err)
 			reply(req.Conn, proto.ErrUnexpected)
 		} else {
 			req.ResponseWriter.Close()