Queue Retrieve Tasks automatically according their Scheduled Time dcm…

…4che#2368
mingdatacom · Jan 15, 2020 · bbd177b · bbd177b
1 parent a611578
commit bbd177b
Show file tree

Hide file tree

Showing 115 changed files with 237 additions and 109 deletions.
diff --git a/dcm4chee-arc-assembly/pom.xml b/dcm4chee-arc-assembly/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif
@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on December 17, 2019, 3:01:57 PM
+# Generated by Apache Directory Studio on January 13, 2020, 2:44:26 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -4441,6 +4441,45 @@ m-equality: booleanMatch
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-singleValue: TRUE
 
+dn: m-oid=1.2.40.0.13.1.15.110.3.339, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.339
+m-name: dcmRetryInProcessOnStartup
+m-description: Indicates to retry tasks left in status IN PROCESS on system star
+ t-up; false if absent.
+m-equality: booleanMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.340, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.340
+m-name: dcmRetrieveTaskPollingInterval
+m-description: Retrieve Task Polling Interval in ISO-8601 duration format PnDTnH
+ nMnS.
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.341, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.341
+m-name: dcmRetrieveTaskFetchSize
+m-description: Limit result set of DB query for Retrieve Tasks ready for process
+ ing; 100 if absent
+m-equality: integerMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+m-singleValue: TRUE
+
 dn: ou=comparators, cn=dcm4chee-archive, ou=schema
 objectclass: organizationalUnit
 objectclass: top
@@ -4586,6 +4625,7 @@ m-may: dcmRetryDelay
 m-may: dcmMaxRetryDelay
 m-may: dcmRetryDelayMultiplier
 m-may: dcmRetryOnWarning
+m-may: dcmRetryInProcessOnStartup
 m-may: dcmPurgeQueueMessageCompletedDelay
 m-may: dcmPurgeQueueMessageFailedDelay
 m-may: dcmPurgeQueueMessageWarningDelay
@@ -5090,6 +5130,8 @@ m-may: dcmAltCMoveSCP
 m-may: dcmDiffStudiesIncludefieldAll
 m-may: dcmExportTaskPollingInterval
 m-may: dcmExportTaskFetchSize
+m-may: dcmRetrieveTaskPollingInterval
+m-may: dcmRetrieveTaskFetchSize
 m-may: dcmPurgeStoragePollingInterval
 m-may: dcmPurgeStorageFetchSize
 m-may: dcmFailedToDeletePollingInterval

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif
@@ -1635,6 +1635,16 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.339 NAME 'dcmRetryInProcessOnStartup'
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.340 NAME 'dcmRetrieveTaskPollingInterval'
+  DESC 'Retrieve Task Polling Interval in ISO-8601 duration format PnDTnHnMnS.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.341 NAME 'dcmRetrieveTaskFetchSize'
+  DESC 'Limit result set of DB query for Retrieve Tasks ready for processing; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -1712,6 +1722,8 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmDiffStudiesIncludefieldAll $
     dcmExportTaskPollingInterval $
     dcmExportTaskFetchSize $
+    dcmRetrieveTaskPollingInterval $
+    dcmRetrieveTaskFetchSize $
     dcmPurgeStoragePollingInterval $
     dcmPurgeStorageFetchSize $
     dcmFailedToDeletePollingInterval $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema b/dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema
@@ -1964,6 +1964,18 @@ attributetype ( 1.2.40.0.13.1.15.110.3.339 NAME 'dcmRetryInProcessOnStartup'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 
+attributetype ( 1.2.40.0.13.1.15.110.3.340 NAME 'dcmRetrieveTaskPollingInterval'
+  DESC 'Retrieve Task Polling Interval in ISO-8601 duration format PnDTnHnMnS.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+
+attributetype ( 1.2.40.0.13.1.15.110.3.341 NAME 'dcmRetrieveTaskFetchSize'
+  DESC 'Limit result set of DB query for Retrieve Tasks ready for processing; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
+
 objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -2041,6 +2053,8 @@ objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmDiffStudiesIncludefieldAll $
     dcmExportTaskPollingInterval $
     dcmExportTaskFetchSize $
+    dcmRetrieveTaskPollingInterval $
+    dcmRetrieveTaskFetchSize $
     dcmPurgeStoragePollingInterval $
     dcmPurgeStorageFetchSize $
     dcmFailedToDeletePollingInterval $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif
@@ -1635,6 +1635,16 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.339 NAME 'dcmRetryInProcessOnStartup
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.340 NAME 'dcmRetrieveTaskPollingInterval'
+  DESC 'Retrieve Task Polling Interval in ISO-8601 duration format PnDTnHnMnS.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.341 NAME 'dcmRetrieveTaskFetchSize'
+  DESC 'Limit result set of DB query for Retrieve Tasks ready for processing; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
 -
 replace: olcObjectClasses
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
@@ -1714,6 +1724,8 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmDiffStudiesIncludefieldAll $
     dcmExportTaskPollingInterval $
     dcmExportTaskFetchSize $
+    dcmRetrieveTaskPollingInterval $
+    dcmRetrieveTaskFetchSize $
     dcmPurgeStoragePollingInterval $
     dcmPurgeStorageFetchSize $
     dcmFailedToDeletePollingInterval $

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif
@@ -1634,6 +1634,16 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.339 NAME 'dcmRetryInProcessOnStartup
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.340 NAME 'dcmRetrieveTaskPollingInterval'
+  DESC 'Retrieve Task Polling Interval in ISO-8601 duration format PnDTnHnMnS.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.341 NAME 'dcmRetrieveTaskFetchSize'
+  DESC 'Limit result set of DB query for Retrieve Tasks ready for processing; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -1711,6 +1721,8 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmDiffStudiesIncludefieldAll $
     dcmExportTaskPollingInterval $
     dcmExportTaskFetchSize $
+    dcmRetrieveTaskPollingInterval $
+    dcmRetrieveTaskFetchSize $
     dcmPurgeStoragePollingInterval $
     dcmPurgeStorageFetchSize $
     dcmFailedToDeletePollingInterval $

diff --git a/.../resources/ldap/update-config-5.20.1.ldif → .../resources/ldap/update-config-5.21.0.ldif b/.../resources/ldap/update-config-5.20.1.ldif → .../resources/ldap/update-config-5.21.0.ldif
diff --git a/dcm4chee-arc-audit/pom.xml b/dcm4chee-arc-audit/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-code/pom.xml b/dcm4chee-arc-code/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-compress/pom.xml b/dcm4chee-arc-compress/pom.xml
@@ -46,7 +46,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf-data/pom.xml b/dcm4chee-arc-conf-data/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf-json/pom.xml b/dcm4chee-arc-conf-json/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf-keycloak/pom.xml b/dcm4chee-arc-conf-keycloak/pom.xml
@@ -46,7 +46,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf-ldap/pom.xml b/dcm4chee-arc-conf-ldap/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <artifactId>dcm4chee-arc-parent</artifactId>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf-rs/pom.xml b/dcm4chee-arc-conf-rs/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf-test/pom.xml b/dcm4chee-arc-conf-test/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
         <artifactId>dcm4chee-arc-parent</artifactId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <artifactId>dcm4chee-arc-conf-test</artifactId>
 

diff --git a/dcm4chee-arc-conf-ui/pom.xml b/dcm4chee-arc-conf-ui/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-conf/pom.xml b/dcm4chee-arc-conf/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <artifactId>dcm4chee-arc-parent</artifactId>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-cors/pom.xml b/dcm4chee-arc-cors/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <artifactId>dcm4chee-arc-parent</artifactId>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-ctrl/pom.xml b/dcm4chee-arc-ctrl/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <artifactId>dcm4chee-arc-parent</artifactId>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-delete/pom.xml b/dcm4chee-arc-delete/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-diff-rs/pom.xml b/dcm4chee-arc-diff-rs/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <artifactId>dcm4chee-arc-parent</artifactId>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-diff/pom.xml b/dcm4chee-arc-diff/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <artifactId>dcm4chee-arc-parent</artifactId>
         <groupId>org.dcm4che.dcm4chee-arc</groupId>
-        <version>5.20.0</version>
+        <version>5.21.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-dimse-rs/pom.xml b/dcm4chee-arc-dimse-rs/pom.xml
@@ -43,7 +43,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-ear/pom.xml b/dcm4chee-arc-ear/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-entity/pom.xml b/dcm4chee-arc-entity/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.20.0</version>
+    <version>5.21.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>