X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fjobs%2Fjobs.go;h=0bf2f12a06d709ce4d445963078f7737e82cdcaf;hb=db7b5c801bdc96889aea18ab190f2b72fa8d8e06;hp=6dad5fd9769f8da8adca72d5dabbca518ad76c8e;hpb=036962c60e1cfa18a689dffa1a8b92d335e6063e;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/jobs/jobs.go b/dmaap-mediator-producer/internal/jobs/jobs.go index 6dad5fd9..0bf2f12a 100644 --- a/dmaap-mediator-producer/internal/jobs/jobs.go +++ b/dmaap-mediator-producer/internal/jobs/jobs.go @@ -21,33 +21,40 @@ package jobs import ( - "encoding/json" "fmt" - "os" + "strings" "sync" + "time" + "github.com/confluentinc/confluent-kafka-go/kafka" log "github.com/sirupsen/logrus" "oransc.org/nonrtric/dmaapmediatorproducer/internal/config" + "oransc.org/nonrtric/dmaapmediatorproducer/internal/kafkaclient" "oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient" ) type TypeData struct { - TypeId string `json:"id"` - DMaaPTopicURL string `json:"dmaapTopicUrl"` - jobsHandler *jobsHandler + Identity string `json:"id"` + jobsHandler *jobsHandler } +type sourceType string + +const dMaaPSource = sourceType("dmaap") +const kafkaSource = sourceType("kafka") + type JobInfo struct { - Owner string `json:"owner"` - LastUpdated string `json:"last_updated"` - InfoJobIdentity string `json:"info_job_identity"` - TargetUri string `json:"target_uri"` - InfoJobData interface{} `json:"info_job_data"` - InfoTypeIdentity string `json:"info_type_identity"` + Owner string `json:"owner"` + LastUpdated string `json:"last_updated"` + InfoJobIdentity string `json:"info_job_identity"` + TargetUri string `json:"target_uri"` + InfoJobData Parameters `json:"info_job_data"` + InfoTypeIdentity string `json:"info_type_identity"` + sourceType sourceType } type JobTypesManager interface { - LoadTypesFromConfiguration() ([]config.TypeDefinition, error) + LoadTypesFromConfiguration(types []config.TypeDefinition) []config.TypeDefinition GetSupportedTypes() []string } @@ -57,19 +64,19 @@ type JobsManager interface { } type JobsManagerImpl struct { - configFile string allTypes map[string]TypeData pollClient restclient.HTTPClient mrAddress string + kafkaFactory kafkaclient.KafkaFactory distributeClient restclient.HTTPClient } -func NewJobsManagerImpl(typeConfigFilePath string, pollClient restclient.HTTPClient, mrAddr string, distributeClient restclient.HTTPClient) *JobsManagerImpl { +func NewJobsManagerImpl(pollClient restclient.HTTPClient, mrAddr string, kafkaFactory kafkaclient.KafkaFactory, distributeClient restclient.HTTPClient) *JobsManagerImpl { return &JobsManagerImpl{ - configFile: typeConfigFilePath, allTypes: make(map[string]TypeData), pollClient: pollClient, mrAddress: mrAddr, + kafkaFactory: kafkaFactory, distributeClient: distributeClient, } } @@ -77,6 +84,7 @@ func NewJobsManagerImpl(typeConfigFilePath string, pollClient restclient.HTTPCli func (jm *JobsManagerImpl) AddJobFromRESTCall(ji JobInfo) error { if err := jm.validateJobInfo(ji); err == nil { typeData := jm.allTypes[ji.InfoTypeIdentity] + ji.sourceType = typeData.jobsHandler.sourceType typeData.jobsHandler.addJobCh <- ji log.Debug("Added job: ", ji) return nil @@ -87,7 +95,7 @@ func (jm *JobsManagerImpl) AddJobFromRESTCall(ji JobInfo) error { func (jm *JobsManagerImpl) DeleteJobFromRESTCall(jobId string) { for _, typeData := range jm.allTypes { - log.Debugf("Deleting job %v from type %v", jobId, typeData.TypeId) + log.Debugf("Deleting job %v from type %v", jobId, typeData.Identity) typeData.jobsHandler.deleteJobCh <- jobId } log.Debug("Deleted job: ", jobId) @@ -107,26 +115,17 @@ func (jm *JobsManagerImpl) validateJobInfo(ji JobInfo) error { return nil } -func (jm *JobsManagerImpl) LoadTypesFromConfiguration() ([]config.TypeDefinition, error) { - typeDefsByte, err := os.ReadFile(jm.configFile) - if err != nil { - return nil, err - } - typeDefs := struct { - Types []config.TypeDefinition `json:"types"` - }{} - err = json.Unmarshal(typeDefsByte, &typeDefs) - if err != nil { - return nil, err - } - for _, typeDef := range typeDefs.Types { - jm.allTypes[typeDef.Id] = TypeData{ - TypeId: typeDef.Id, - DMaaPTopicURL: typeDef.DmaapTopicURL, - jobsHandler: newJobsHandler(typeDef.Id, typeDef.DmaapTopicURL, jm.pollClient, jm.distributeClient), +func (jm *JobsManagerImpl) LoadTypesFromConfiguration(types []config.TypeDefinition) []config.TypeDefinition { + for _, typeDef := range types { + if typeDef.DMaaPTopicURL == "" && typeDef.KafkaInputTopic == "" { + log.Fatal("DMaaPTopicURL or KafkaInputTopic must be defined for type: ", typeDef.Identity) + } + jm.allTypes[typeDef.Identity] = TypeData{ + Identity: typeDef.Identity, + jobsHandler: newJobsHandler(typeDef, jm.mrAddress, jm.kafkaFactory, jm.pollClient, jm.distributeClient), } } - return typeDefs.Types, nil + return types } func (jm *JobsManagerImpl) GetSupportedTypes() []string { @@ -140,7 +139,7 @@ func (jm *JobsManagerImpl) GetSupportedTypes() []string { func (jm *JobsManagerImpl) StartJobsForAllTypes() { for _, jobType := range jm.allTypes { - go jobType.jobsHandler.startPollingAndDistribution(jm.mrAddress) + go jobType.jobsHandler.startPollingAndDistribution() } } @@ -148,30 +147,35 @@ func (jm *JobsManagerImpl) StartJobsForAllTypes() { type jobsHandler struct { mu sync.Mutex typeId string - topicUrl string + sourceType sourceType + pollingAgent pollingAgent jobs map[string]job addJobCh chan JobInfo deleteJobCh chan string - pollClient restclient.HTTPClient distributeClient restclient.HTTPClient } -func newJobsHandler(typeId string, topicURL string, pollClient restclient.HTTPClient, distributeClient restclient.HTTPClient) *jobsHandler { +func newJobsHandler(typeDef config.TypeDefinition, mRAddress string, kafkaFactory kafkaclient.KafkaFactory, pollClient restclient.HTTPClient, distributeClient restclient.HTTPClient) *jobsHandler { + pollingAgent := createPollingAgent(typeDef, mRAddress, pollClient, kafkaFactory, typeDef.KafkaInputTopic) + sourceType := kafkaSource + if typeDef.DMaaPTopicURL != "" { + sourceType = dMaaPSource + } return &jobsHandler{ - typeId: typeId, - topicUrl: topicURL, + typeId: typeDef.Identity, + sourceType: sourceType, + pollingAgent: pollingAgent, jobs: make(map[string]job), addJobCh: make(chan JobInfo), deleteJobCh: make(chan string), - pollClient: pollClient, distributeClient: distributeClient, } } -func (jh *jobsHandler) startPollingAndDistribution(mRAddress string) { +func (jh *jobsHandler) startPollingAndDistribution() { go func() { for { - jh.pollAndDistributeMessages(mRAddress) + jh.pollAndDistributeMessages() } }() @@ -182,18 +186,20 @@ func (jh *jobsHandler) startPollingAndDistribution(mRAddress string) { }() } -func (jh *jobsHandler) pollAndDistributeMessages(mRAddress string) { +func (jh *jobsHandler) pollAndDistributeMessages() { log.Debugf("Processing jobs for type: %v", jh.typeId) - messagesBody, error := restclient.Get(mRAddress+jh.topicUrl, jh.pollClient) + messagesBody, error := jh.pollingAgent.pollMessages() if error != nil { - log.Warn("Error getting data from MR. Cause: ", error) + log.Warn("Error getting data from source. Cause: ", error) + time.Sleep(time.Minute) // Must wait before trying to call data source again + return } - log.Debug("Received messages: ", string(messagesBody)) jh.distributeMessages(messagesBody) } func (jh *jobsHandler) distributeMessages(messages []byte) { - if len(messages) > 2 { + if string(messages) != "[]" && len(messages) > 0 { // MR returns an ampty array if there are no messages. + log.Debug("Distributing messages: ", string(messages)) jh.mu.Lock() defer jh.mu.Unlock() for _, job := range jh.jobs { @@ -247,6 +253,61 @@ func (jh *jobsHandler) deleteJob(deletedJob string) { jh.mu.Unlock() } +type pollingAgent interface { + pollMessages() ([]byte, error) +} + +func createPollingAgent(typeDef config.TypeDefinition, mRAddress string, pollClient restclient.HTTPClient, kafkaFactory kafkaclient.KafkaFactory, topicID string) pollingAgent { + if typeDef.DMaaPTopicURL != "" { + return dMaaPPollingAgent{ + messageRouterURL: mRAddress + typeDef.DMaaPTopicURL, + pollClient: pollClient, + } + } else { + return newKafkaPollingAgent(kafkaFactory, typeDef.KafkaInputTopic) + } +} + +type dMaaPPollingAgent struct { + messageRouterURL string + pollClient restclient.HTTPClient +} + +func (pa dMaaPPollingAgent) pollMessages() ([]byte, error) { + return restclient.Get(pa.messageRouterURL, pa.pollClient) +} + +type kafkaPollingAgent struct { + kafkaClient kafkaclient.KafkaClient +} + +func newKafkaPollingAgent(kafkaFactory kafkaclient.KafkaFactory, topicID string) kafkaPollingAgent { + c, err := kafkaclient.NewKafkaClient(kafkaFactory, topicID) + if err != nil { + log.Fatalf("Cannot create Kafka client for topic: %v, error details: %v\n", topicID, err) + } + return kafkaPollingAgent{ + kafkaClient: c, + } +} + +func (pa kafkaPollingAgent) pollMessages() ([]byte, error) { + msg, err := pa.kafkaClient.ReadMessage() + if err == nil { + return msg, nil + } else { + if isKafkaTimedOutError(err) { + return []byte(""), nil + } + return nil, err + } +} + +func isKafkaTimedOutError(err error) bool { + kafkaErr, ok := err.(kafka.Error) + return ok && kafkaErr.Code() == kafka.ErrTimedOut +} + type job struct { jobInfo JobInfo client restclient.HTTPClient @@ -255,6 +316,7 @@ type job struct { } func newJob(j JobInfo, c restclient.HTTPClient) job { + return job{ jobInfo: j, client: c, @@ -263,7 +325,24 @@ func newJob(j JobInfo, c restclient.HTTPClient) job { } } +type Parameters struct { + BufferTimeout BufferTimeout `json:"bufferTimeout"` +} + +type BufferTimeout struct { + MaxSize int `json:"maxSize"` + MaxTimeMiliseconds int64 `json:"maxTimeMiliseconds"` +} + func (j *job) start() { + if j.isJobBuffered() { + j.startReadingMessagesBuffered() + } else { + j.startReadingSingleMessages() + } +} + +func (j *job) startReadingSingleMessages() { out: for { select { @@ -276,10 +355,92 @@ out: } } +func (j *job) startReadingMessagesBuffered() { +out: + for { + select { + case <-j.controlChannel: + log.Debug("Stop distribution for job: ", j.jobInfo.InfoJobIdentity) + break out + default: + msgs := j.read(j.jobInfo.InfoJobData.BufferTimeout) + if len(msgs) > 0 { + j.sendMessagesToConsumer(msgs) + } + } + } +} + +func (j *job) read(bufferParams BufferTimeout) []byte { + wg := sync.WaitGroup{} + wg.Add(bufferParams.MaxSize) + rawMsgs := make([][]byte, 0, bufferParams.MaxSize) + c := make(chan struct{}) + go func() { + i := 0 + out: + for { + select { + case <-c: + break out + case msg := <-j.messagesChannel: + rawMsgs = append(rawMsgs, msg) + i++ + wg.Done() + if i == bufferParams.MaxSize { + break out + } + } + } + }() + j.waitTimeout(&wg, time.Duration(bufferParams.MaxTimeMiliseconds)*time.Millisecond) + close(c) + return getAsJSONArray(rawMsgs) +} + +func getAsJSONArray(rawMsgs [][]byte) []byte { + json := `"[` + for i := 0; i < len(rawMsgs); i++ { + msg := string(rawMsgs[i]) + json = json + strings.ReplaceAll(msg, "\"", "\\\"") + if i < len(rawMsgs)-1 { + json = json + "," + } + } + return []byte(json + `]"`) +} + +func (j *job) waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool { + c := make(chan struct{}) + go func() { + defer close(c) + wg.Wait() + }() + select { + case <-c: + return false // completed normally + case <-time.After(timeout): + return true // timed out + } +} + func (j *job) sendMessagesToConsumer(messages []byte) { log.Debug("Processing job: ", j.jobInfo.InfoJobIdentity) - if postErr := restclient.Post(j.jobInfo.TargetUri, messages, j.client); postErr != nil { + contentType := restclient.ContentTypeJSON + if j.isJobKafka() && !j.isJobBuffered() { + contentType = restclient.ContentTypePlain + } + if postErr := restclient.Post(j.jobInfo.TargetUri, messages, contentType, j.client); postErr != nil { log.Warnf("Error posting data for job: %v. Cause: %v", j.jobInfo, postErr) + return } log.Debugf("Messages for job: %v distributed to consumer: %v", j.jobInfo.InfoJobIdentity, j.jobInfo.Owner) } + +func (j *job) isJobBuffered() bool { + return j.jobInfo.InfoJobData.BufferTimeout.MaxSize > 0 && j.jobInfo.InfoJobData.BufferTimeout.MaxTimeMiliseconds > 0 +} + +func (j *job) isJobKafka() bool { + return j.jobInfo.sourceType == kafkaSource +}