Commit Graph

73 Commits

Author SHA1 Message Date
Luca Frosini 62664d2a51 fixed test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164679 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-03-02 16:01:03 +00:00
Luca Frosini 19d7dc83e7 Logging every 1% elaborated rows when the total number is greatest than 1000000
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164545 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-23 09:55:54 +00:00
Luca Frosini e8b6dfcc50 Refs #11258 Add possibility to force to rerun an already completed aggregation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164535 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 16:13:54 +00:00
Luca Frosini a511653fe4 Fixing test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164533 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 15:19:21 +00:00
Luca Frosini df86a33f1f Fixing test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164528 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 14:38:49 +00:00
Luca Frosini beddf36e7a Refs #11258 Added retry when inserting or deleting documents
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164527 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 14:37:04 +00:00
Luca Frosini 243c1cd6c7 Refs #11258: Add possibility to force to rerun an already completed aggregation
Task-Url: https://support.d4science.org/issues/11258

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164526 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 14:32:06 +00:00
Luca Frosini f0332ebd4d Refs #11258 Added retry when inserting or deleting documents
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164525 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 14:31:35 +00:00
Luca Frosini a6a5302227 Refs #11258: Add possibility to force aggregation (already made or after the allowed range)
Task-Url: https://support.d4science.org/issues/11258

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164522 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-22 13:49:54 +00:00
Luca Frosini 8873d8843e Refs #11233: Add Regex Rules to Accounting Aggregator
Task-Url: https://support.d4science.org/issues/11233

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@164463 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-20 17:26:37 +00:00
Luca Frosini 03c705983d Logging every 5% elaborated rows when the total number is greatest than 100000
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@163326 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-15 17:45:59 +00:00
Luca Frosini c9d6c39777 Logging every 5% elaborated rows when the total number is greatest than 100000
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@163325 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-15 17:45:41 +00:00
Luca Frosini 1b67851978 Upgraded version and changelog after release 4.10.0 refs #10903. Merged changes made directly in release branch.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@163296 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-15 14:00:49 +00:00
Luca Frosini dedee9651f Fixed test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@162711 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-01-29 11:48:31 +00:00
Luca Frosini a00a70e57b Fixed test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@162697 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-01-26 17:24:34 +00:00
Luca Frosini 61359077fa Added test for fix of old records persisted using double instead of long for creationTime, startTime, endTime and instead of int for duration and fixed bugs
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@162675 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-01-26 15:02:43 +00:00
Luca Frosini f705b73ca9 Added test for fix of old records persisted using double instead of long for creationTime, startTime, endTime and instead of int for duration and fixed bugs
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@162674 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-01-26 15:02:30 +00:00
Luca Frosini 4cf6d72113 Added fix for old records persisted using double instead of long for creationTime, startTime, endTime and instead of int for duration.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@162662 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-01-26 14:00:16 +00:00
Luca Frosini 07677541f1 Removed unneeded constant
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@160505 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-12-14 14:28:53 +00:00
Luca Frosini 13262bdb72 Fixed javadoc warning
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@157730 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-10-27 14:50:14 +00:00
Luca Frosini d7731934f5 Removed .settings folder from svn
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@157687 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-10-27 13:15:09 +00:00
Luca Frosini 26c9cf5cf2 Merged from branch
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@155053 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-10-10 10:25:13 +00:00
Luca Frosini b2e0eb62cb Merged from branch
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154647 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 16:07:54 +00:00
Luca Frosini 891d15e355 Fixing exception message
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154628 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 15:00:05 +00:00
Luca Frosini 1c7574c4f3 Fixed typo
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154626 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 14:56:44 +00:00
Luca Frosini b1e9cfdc95 Catching the proper exception
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154624 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 14:55:56 +00:00
Luca Frosini f954b7ff03 Added guard to avoid to lose data in case of problems
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154623 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 14:55:39 +00:00
Luca Frosini f01c2b819c commented test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154586 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 14:01:26 +00:00
Luca Frosini 08605f5d1a changes in test due to changes in api
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154584 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 13:59:55 +00:00
Luca Frosini d7deb6e907 Added 3 retry while elaborating row
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154566 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 13:33:39 +00:00
Luca Frosini 81ee077a94 Sincronized getInstance() method and fixed error message
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154565 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-26 13:32:32 +00:00
Luca Frosini 3d6c113185 fixed log
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154445 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-22 15:47:39 +00:00
Luca Frosini f4392280e3 fixed code
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154427 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-22 13:16:04 +00:00
Luca Frosini cfc1fb3980 Allowing elaborate only when last update is before last 8 hours. This avoid to start two recovery/elaboration while the previous is not terminated.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154426 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-22 13:07:54 +00:00
Luca Frosini a7590738c1 Added possibility to specify range in aggregation and recovery. This allow to schedule multiple instance simultaneously
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154419 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-22 12:30:48 +00:00
Luca Frosini 6a9c463ac9 Updating LastUpdateTime before starting to execute any kind of operation when the AggregationStatus were already created on db
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154349 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-21 08:03:56 +00:00
Luca Frosini f531cd4e8c Fix to support old usage records
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@154348 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-21 07:53:53 +00:00
Luca Frosini 5c90b8b5b4 Fixed Enum
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153262 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-19 14:41:12 +00:00
Luca Frosini d4418c58a5 Improved log
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153218 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-19 08:10:08 +00:00
Luca Frosini f27a938456 Fixed log
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153206 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-18 16:44:34 +00:00
Luca Frosini 756a64b2de Fixed test due to changes in api
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153172 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-18 13:38:49 +00:00
Luca Frosini 1790702918 Changed test log level
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153171 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-18 13:38:16 +00:00
Luca Frosini a6d58dc724 Patch for old records
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153168 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-18 13:07:34 +00:00
Luca Frosini db2cb04b0f fixed log
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153110 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-15 09:20:13 +00:00
Luca Frosini 0d7235a52b Added malformed records management
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153109 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-15 09:08:52 +00:00
Luca Frosini 4466e2bbac Added malformed records management
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153108 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-15 08:40:03 +00:00
Luca Frosini 7c45f425dc Fixed bug
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153092 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-14 10:37:02 +00:00
Luca Frosini c31b08b5b4 Patch for old records
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153087 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-14 08:58:56 +00:00
Luca Frosini 5abbf6c4c3 Added patch to support old model which uses usageRecordType instead recortType field.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153071 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-13 15:14:16 +00:00
Luca Frosini d0ce92e10a Added patch to support old model which uses usageRecordType instead recortType field.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@153060 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-13 14:27:59 +00:00