summaryrefslogtreecommitdiffstats
path: root/datafile-app-server/src
AgeCommit message (Collapse)AuthorFilesLines
2019-05-22Merge "Fix for robustness"Henrik Andersson3-9/+16
2019-05-17Fix, skip FTP retry in certain casesPatrikBuhr7-13/+77
In certain conditions there is no reason to retry fetching files. For instance when the file is removed in the PNF or when the password/certificate is wrong. When the DFC is started there are always queued VES events that referes to removed files which in turn results in that the DFC will retry fetching these files in vain. The DFC house keeps its number of concurrents tasks to not exeed quotas for memory,open file descriptors etc. As more threads are occupied with retrying, the fewer threads can do their intended work, which decreases the throughput. Testing has showed that already when the number of PNFs are 10, the throughput is radically decreased (and the problem is then escalating). Change-Id: I4833724a3ef3509025f4a0a438c6c8025932b0f4 Issue-ID: DCAEGEN2-1508 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-17Fix for robustnessPatrikBuhr3-9/+16
In the long time stability test it has showed that when there are an exessive amount of FileReady events, the DFC will fetch these from the MR and build up an internal queue. This has the effect that the DFC will consume too much memory. Itmight also affect load balancing (in case of several DFC instances) so that one might consume all events and the others get nothing. The DFC should not fetch new FileReady events when it fully loaded with work. Change-Id: I58665edd678d2f1c8a32d0e56455228b522aab40 Issue-ID: DCAEGEN2-1509 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-13Bugfix: add MDC context to http redirect logsRehanRaza4-9/+32
Change-Id: Icdf00480eed43536a8b4693cbb208560f0881c95 Issue-ID: DCAEGEN2-1462 Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
2019-05-08Code improvement, FilePublishInformation serializingPatrikBuhr5-94/+36
Updated serializer of FilePublishInformation so that only elements that should be part of publishing is included. Change-Id: If5632af8bf9fd26f8bc96b25d8bfbccf63dfec2f Issue-ID: DCAEGEN2-1488 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-05-07Merge "Bugfix, trace context"Henrik Andersson1-4/+2
2019-05-05Ownership fix in config directoryTamasBakai1-1/+1
Change-Id: Iec3ca75c42642da27c52bccd6d60811c434f778a Issue-ID: DCAEGEN2-1466 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
2019-05-02Bugfix, trace contextPatrikBuhr1-4/+2
When retrying of file publish, the RequestID in the trace context is incorect. The context must be expicitly updated since retrying is executed in a separate thread. Change-Id: I1c5dc0ba0e53c1219e23f93d8c5b420996a16c93 Issue-ID: DCAEGEN2-1462 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-25Extend Swagger for actuator end-points also1.1.21.1.1TamasBakai1-10/+12
Change-Id: Ia036f7d79d25ceb2f1e465d79f17db1acbabbfbf Issue-ID: DCAEGEN2-1443 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
2019-04-16Bugfix, serializing in DataRouterPublisherPatrikBuhr2-1/+8
This fixes a bug introduced in c7b0c7014688c447d411f791a094440403e65228. The new property must be removed before publishing to data router. The consequense of the bug is that the DR rejects the publishing. Change-Id: Ib42cbed4decdba4c13678cea47dff35ca77679a5 Issue-ID: DCAEGEN2-1305 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-12Improved loggingPatrikBuhr12-102/+169
File name is used in Requext_ID to make it more easy to trouble shoot. Change-Id: Ied98766f1a177a9bda35ec5892a60d06619ff3a7 Issue-ID: DCAEGEN2-1305 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-12Fixed build problemsPatrikBuhr1-1/+1
Fixed a build problem cause by a merge error from previous commits. Fixes warnings from maven compile Change-Id: I1ce88b2686b3be5ecd17113cbfde3e65297c27c6 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-11Merge "Robustness issue"Vijay Venkatesh Kumar2-19/+40
2019-04-11Robustness issuePatrikBuhr3-20/+41
Limiting the number of paralell threads when retying of ftp or publish. Previously there was no upper limit on how many paralel threads that could be started by retry attempts. For instance, a worker thread with 100 new files would start 100 new threads when the ftt server was unavailable. Change-Id: Ia8792f03ea55c0c467ef248ddc9d59187c06a946 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-04-11Extend heartbeat to also include som health statuselinuxhenrik5-7/+146
Add info about the internal status of DFC to the healtCheck message. Change-Id: Ic2ad3e5b97c42d6affe1ac4e1d7cf2274027f881 Issue-ID: DCAEGEN2-1403 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-04-11Housekeepingelinuxhenrik62-627/+2769
No functional changes made in this commit. Removed CheckStyle and Sonar warnings. Formatted code. Renamed methods and classes for better understanding. Removed unnecessary classes. Moved all code to single project. Change-Id: Ie3feb6c6a985e94a382812aa083dcf57bc46c7b3 Issue-ID: DCAEGEN2-1367 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-04-10Updating certificatesTamasBakai5-18/+15
Issue-ID: DCAEGEN2-1300 Change-Id: I9ce457b69e5866e77a465fb040d196b8905ca274 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
2019-04-04Improved loggingPatrikBuhr14-216/+157
Fixed problem with startup which lead to that the REST API was not working running locally. Fixed problem with DmaapProducerHttpClient which would use no timeout, which can lead to infinitly haninging threads. A long timeout is used instead. Change-Id: I28469b1b3aaad0dab4cf247bb8af968e71a60133 Issue-ID: DCAEGEN2-1305 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-03-29Change file name sent to DataRouterelinuxhenrik6-30/+16
In the previous commit for this issue, the file name sent to DataRouter was changed. This turned out to be wrong, so in this commit it is changed back again. Change-Id: I9b0d726f406758846fd256626e73edf59d710c8b Issue-ID: DCAEGEN2-1256 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2019-03-22Local filename updated, stability issuesPatrikBuhr17-253/+204
The local filename is changed so it contains PNF name instead of the PNF IP address. The paralellism is restricted to 100 worker threads in order to solve problems with too many open file descriptors and out of memory. Logging is improved. Change-Id: I24ce2e23020cc253a3c7bebac1ab5cf703b5b144 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-03-21Add check to DataRouter if file has been publishedmaximesson16-579/+1124
For each file in the FileReady message that DFC does not know if it has been published yet, it should ask DataRouter if it has been published already to avoid downloading and publishing a file more than once. Change-Id: I18117a6e968ec929aa255052a4c44f890a8ed39d Issue-ID: DCAEGEN2-1256 Signed-off-by: maximesson <maxime.bonneau@est.tech>
2019-03-14Thread safety issuesPatrikBuhr7-158/+145
The TrustManager is now loaded and initialized once in a thread safe way (instead of each time it is used). Removed some unneeded wrappers. Using AutoCloseable for FTP clients to make sure they are closed in case of exceptions. Made AppConfig thread safe. Change-Id: Ia6a2c8a76bf960013180fdd7c53ae0ff17b26505 Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-03-08DFC logging according to ONAP specificationRehanRaza12-119/+210
Change-Id: I6fe18ce3bdbc6d0b1cf5c5e65534cab694cfb898 Issue-ID: DCAEGEN2-1305 Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
2019-03-08Merge "Improvement of the parallelism"Tony Hansen3-67/+379
2019-03-07Change to docker-maven-pluginRehanRaza1-0/+0
Change-Id: I5dc3c5b69b2ef764992e2db76eb9cc154ff5adf7 Issue-ID: DCAEGEN2-1269 Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
2019-03-06Improvement of the parallelismPatrikBuhr3-67/+379
The reactive framework Scedulers uses to few threads. (the same number as the number of processors). That is too few for an io-intense application like this where CPU is not the limiting factor. Change-Id: Ia5f41e75716d309f47dce5f5273b739f7e6d136a Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-03-05Fix Docker imageRehanRaza1-2/+1
Change-Id: Icf8a37ea63e78d70256571d1bce424e629a04b55 Issue-ID: DCAEGEN2-1269 Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
2019-02-27Purging of cached informationPatrikBuhr4-18/+154
The datafile collector has a cache will all previously published files. The cache is on regular intevals purged so that non used entries are removed so that it does not grow infinitely. Added a unit test. Change-Id: I8897fee4522c97031f735b1d6774803dcb73926b Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-02-27Merge "Fixed some sonar issues"Tony Hansen5-46/+50
2019-02-22Fixed some sonar issuesPatrikBuhr5-46/+50
Changed some Flux to Mono. Removed some obfuscating wrappers. Issue-ID: DCAEGEN2-1118 Change-Id: I76dcaea7c69608cf404389fad93f7539f735aad2 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-02-22Run DFC docker container as a non-root userRehanRaza1-0/+42
Change-Id: I82504ebebc8ddf48f6ee6b1c1dfbe433c60ab1aa Issue-ID: DCAEGEN2-1269 Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
2019-02-19Refactor: fix over engineering in ConfigurationYongchaoWu9-433/+148
Remove the duplicated function, move the over engineering code. Make the code simple and understandable. Issue-ID: DCAEGEN2-1222 Change-Id: Iab1737c084421d038b724d2fb41c9d17ebe4dbeb Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
2019-02-15Merge "Add Readme.md"Tony Hansen1-14/+41
2019-02-15Running of file collection in paralellPatrikBuhr26-935/+977
Each FileReady message is run in a separate thread to increase the thoughput. Fetching of files from PNFs is retryed by using the reactive framework. Robustness to temporary failures is increased by retrying to publish fetched files. Fixed so that well known ports (FTPS/SFTP) are used if omitted in the FileReady message URL. Change-Id: I5dfc75a08da0e870fafa3ee1bc83574aca16aabd Issue-ID: DCAEGEN2-1118 Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
2019-02-13Add Readme.mdyanhuanwang1-14/+41
Format code Change-Id: Iba56718868043d3b19c71892f363fbb838f4988a Signed-off-by: Chengkai Yan <martin.c.yan@est.tech> Issue-ID: DCAEGEN2-1039
2019-01-30Fix for integration with SDKpwielebs5-7/+7
Change-Id: I9947531e2cad813ac8936769147bee710db5a335 Issue-ID: DCAEGEN2-1096 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-01-25Integration with SDKpwielebs14-140/+253
* New fields added to DmaapPublisherConfiguraion * New fields added to DmaapConsumerConfiguration * Dmaap Consumer web client replaced by SDK's consumer web client * UTs aligned * Disable enforcer plugin in DFC * Update oparent to 1.2.1 Change-Id: I3569180c15227bc2c8df74fd070571b0aa56fa04 Issue-ID: DCAEGEN2-1096 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2019-01-08use sdk-cbsmicdzied8-412/+11
Change-Id: I615d57927c163d022683ad3cae2703adda48cf88 Issue-ID: DCAEGEN2-1064 Signed-off-by: micdzied <michal.1.dziedzic@nokia.com>
2018-12-10Merge "Make DFC handle multiple messages from MR"Vijay Venkatesh Kumar2-42/+154
2018-12-03fix bugs in jira DCAEGEN2-940 and DCAEGEN2-941Chengkai Yan1-2/+10
Change-Id: Id0b3e295cab0e085746b034caccbf82aca2e0d7b Signed-off-by: Chengkai Yan <martin.c.yan@est.tech> Issue-ID: DCAEGEN2-940 Issue-ID: DCAEGEN2-941
2018-12-03Make DFC handle multiple messages from MRelinuxhenrik2-42/+154
DMaaP MessageRouter might send multiple messages in the same respons when DFC polls. This was not handled by DFC. Change-Id: I78c2fc7f4512a07fadf61c2cf1f6399d466fc873 Issue-ID: DCAEGEN2-1001 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2018-11-28Fix sonar issueselinuxhenrik7-206/+205
Change-Id: I4aff14b6afc5faaf95f28286dc6f2f741191e403 Issue-ID: DCAEGEN2-991 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2018-11-16Update meta-dataChengkai Yan8-190/+636
Add commonEventHeader to X-ATT-DR-META Format code with formatter:off/on Change-Id: I490620af127a03face48bf7b2ad3abf0bb80d4fa Signed-off-by: Chengkai Yan <martin.c.yan@est.tech> Issue-ID: DCAEGEN2-935
2018-11-15Clean up for Sonarelinuxhenrik2-16/+9
Change-Id: I5daa606cd974e43c899b7e35b14d268a255c7102 Issue-ID: DCAEGEN2-835 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2018-11-15Merge "Add code to validate changeType & changeIdentifier"Vijay Venkatesh Kumar2-29/+92
2018-11-06Add cloud config of mutual authentication3.0.0-ONAP1.0.4elinuxhenrik2-18/+27
Change-Id: I8e51c07f750192e1aa03f13c98d3a3a8f0db0f3c Issue-ID: DCAEGEN2-946 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2018-10-30Add code to validate changeType & changeIdentifierChengkai Yan2-29/+92
Change-Id: Ib6731a7529ebb06588e17f91a986764f042b26b7 Signed-off-by: Chengkai Yan <martin.c.yan@est.tech> Issue-ID: DCAEGEN2-923
2018-10-15Improve setKeyManager & setTrustManagerChengkai Yan3-13/+22
Change-Id: I14b1bd6872e40496ce233ec4974ad9e5fd92d949 Signed-off-by: Chengkai Yan <martin.c.yan@est.tech> Issue-ID: DCAEGEN2-867
2018-10-09Fix retry when file download fails1.0.2elinuxhenrik3-26/+150
When the Datafile collector is unable to download the file from an xNF it now retries to collect the file. Change-Id: I61f68f9cf7af1a7fab160b0e936daafd1a23aaf8 Issue-ID: DCAEGEN2-864 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
2018-10-03Fix mutual authenticationVijay Venkatesh Kumar23-536/+351
Last version from demo. Change-Id: Ib41581bf6f9eb92a03edf8434261d3674b6e3e39 Issue-ID: DCAEGEN2-860 Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech> Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>