ing

discovery/discoverer.go

@@ -21,6 +21,7 @@ type Discoverer interface {
 	DiscoverHost(requesterID string, zone *omd.Zone, dh *omd.DiscoverHost)
 	DiscoverPort(requesterID string, host *omd.Host, dp *omd.DiscoverPort)
 	DiscoverService(requesterID string, port *omd.Port, ds *omd.DiscoverService)
+	DiscoverStop(requesterID string, requestID string)
 	Message() <-chan types.DiscoveryMessage
 
 	Shutdown()
@@ -43,9 +44,10 @@ type ofDiscoverer struct {
 	stopChan chan struct{}
 	stopWg   sync.WaitGroup
 
-	requestIds   map[string]bool
+	requestIDs         map[string]bool
-	requestQueue chan types.DiscoveryRequest
+	processingSessions map[string]session.DiscoverySession
-	messageChan  chan types.DiscoveryMessage
+	requestQueue       chan types.DiscoveryRequest
+	messageChan        chan types.DiscoveryMessage
 }
 
 func (d *ofDiscoverer) DiscoverHost(requesterID string, zone *omd.Zone, dh *omd.DiscoverHost) {
@@ -60,6 +62,20 @@ func (d *ofDiscoverer) DiscoverService(requesterID string, port *omd.Port, ds *o
 	d.enqueue(retainDiscoveryRequest(requesterID, types.DiscoveryRequestTypeService, port, ds))
 }
 
+func (d *ofDiscoverer) DiscoverStop(requesterID string, requestID string) {
+	_, ok := d.requestIDs[requestID]
+	if ok {
+		d.requestIDs[requestID] = false
+		return
+	}
+
+	s, ok := d.processingSessions[requestID]
+	if !ok {
+		return
+	}
+	s.Shutdown()
+}
+
 func (d *ofDiscoverer) Message() <-chan types.DiscoveryMessage {
 	return d.messageChan
 }
@@ -85,7 +101,8 @@ func (d *ofDiscoverer) Shutdown() {
 func (d *ofDiscoverer) start() {
 	d.stopChan = make(chan struct{})
 
-	d.requestIds = make(map[string]bool, 10)
+	d.requestIDs = make(map[string]bool, 10)
+	d.processingSessions = make(map[string]session.DiscoverySession, 2)
 	d.requestQueue = make(chan types.DiscoveryRequest, 10)
 	d.messageChan = make(chan types.DiscoveryMessage, 256)
 
@@ -96,7 +113,7 @@ func (d *ofDiscoverer) start() {
 func (d *ofDiscoverer) enqueue(req *ofDiscoveryRequest) {
 	select {
 	case d.requestQueue <- req:
-		d.requestIds[req.RequestID()] = true
+		d.requestIDs[req.RequestID()] = true
 		d.SendMessage(req, types.DiscoveryMessageTypeQueueing, req.RequestID(), omu.Now())
 		go func() {
 			select {
@@ -129,8 +146,8 @@ LOOP:
 				return
 			}
 
-			canceled, ok := d.requestIds[req.RequestID()]
+			canceled, ok := d.requestIDs[req.RequestID()]
-			delete(d.requestIds, req.RequestID())
+			delete(d.requestIDs, req.RequestID())
 			if !ok || !canceled {
 				req.(*ofDiscoveryRequest).release()
 				continue LOOP
@@ -144,6 +161,7 @@ LOOP:
 
 			d.SendMessage(req, types.DiscoveryMessageTypeStart, omu.Now())
 			s := session.RetainDiscoverySession()
+			d.processingSessions[req.RequestID()] = s
 			d.discover(req, s)
 			select {
 			case <-time.After(time.Second * 1):
@@ -156,6 +174,7 @@ LOOP:
 
 			session.ReleaseDiscoverySession(s)
 			req.(*ofDiscoveryRequest).release()
+			delete(d.processingSessions, req.RequestID())
 
 			log.Print("Discovery Session complete")
 		case <-d.stopChan:

discovery/session/discovery-session.go

@@ -55,6 +55,7 @@ type DiscoverySession interface {
 	DiscoveredServices(port *omd.Port) map[string]*omd.Service
 	DiscoveredAllServices() map[*omd.Port]map[string]*omd.Service
 
+	Shutdown()
 	StopChan() <-chan struct{}
 }
 
@@ -542,6 +543,10 @@ func (ds *ofDiscoverySession) delegate(data interface{}) {
 	}
 }
 
+func (ds *ofDiscoverySession) Shutdown() {
+	close(ds.stopChan)
+}
+
 func (ds *ofDiscoverySession) findHost(host *omd.Host) (h *omd.Host, modified bool) {
 	modified = false
 	var ok bool

server/scanner-servlet.go

@@ -135,8 +135,7 @@ func (s *ScannerServlets) Handle(servletCtx server.ServletCtx,
 			}
 
 			if !s.RPCInvoker.HasMethod(src.Method()) {
-				olog.Logger().Error(err.Error())
+				s.writeError(src, writeChan, orp.E_NO_METHOD, "", fmt.Errorf("%s is not exist", src.Method()))
-				s.writeError(src, writeChan, orp.E_NO_METHOD, "", err)
 				break
 			}
 

service/DiscoveryService.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"log"
 	"reflect"
 
 	"git.loafle.net/overflow_scanner/probe/internal/pubsub"
@@ -160,6 +161,7 @@ func (s *DiscoveryService) DiscoverService(requesterID string, port *omd.Port, d
 	return nil
 }
 
-func (s *DiscoveryService) StopDiscover() error {
+func (s *DiscoveryService) DiscoverStop(requesterID string, requestID string) error {
+	log.Print("requestID ", requestID)
 	return nil
 }