Retry to create/update series metadata on failure after configurable …

…delay dcm4che/dcm4chee-arc-light#1700
dcm4che-dockerfiles · Dec 5, 2018 · 5995dfa · 5995dfa
1 parent aaac717
commit 5995dfa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/ldap/schema/dcm4chee-archive-modify.ldif b/ldap/schema/dcm4chee-archive-modify.ldif
@@ -879,7 +879,7 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.176 NAME 'hl7NoPatientCreateMessageT
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.177 NAME 'dcmAttributeSetType'
-  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
+  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -1294,6 +1294,11 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.261 NAME 'dcmFailedToDeleteFetchSize
   EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.262 NAME 'dcmSeriesMetadataRetryInterval'
+  DESC 'Interval in ISO-8601 duration format PnDTnHnMnS in which failed attempts to create/update aggregated Series Metadata will be retried. If absent, failed attempts will not be retried.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
 -
 delete: olcObjectClasses
 -
@@ -1314,6 +1319,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmSeriesMetadataPollingInterval $
     dcmSeriesMetadataFetchSize $
     dcmSeriesMetadataThreads $
+    dcmSeriesMetadataRetryInterval $
     dcmPurgeInstanceRecords $
     dcmPurgeInstanceRecordsDelay $
     dcmPurgeInstanceRecordsPollingInterval $
@@ -1764,7 +1770,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.28 NAME 'hl7OrderSPSStatus'
     dcmSPSStatus $
     hl7OrderControlStatus ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.29 NAME 'dcmAttributeSet'
-  DESC 'Named Attribute Set for Query Parameter "comparefield" of DIFF-RS and Query Parameter "includefields" of WADO-RS Metadata requests.'
+  DESC 'Named Attribute Set for Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests.'
   SUP top STRUCTURAL
   MUST (
     dcmAttributeSetType $

diff --git a/ldap/schema/dcm4chee-archive.ldif b/ldap/schema/dcm4chee-archive.ldif
@@ -876,7 +876,7 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.176 NAME 'hl7NoPatientCreateMessageT
   SUBSTR caseExactSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.177 NAME 'dcmAttributeSetType'
-  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
+  DESC 'Specifies if this Attribute Set is used by Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests. Enumerated values: QIDO_RS, WADO_RS, DIFF_RS, LEADING_CFIND_SCP.'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -1291,6 +1291,11 @@ olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.261 NAME 'dcmFailedToDeleteFetchSize
   EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE )
+olcAttributeTypes: ( 1.2.40.0.13.1.15.110.3.262 NAME 'dcmSeriesMetadataRetryInterval'
+  DESC 'Interval in ISO-8601 duration format PnDTnHnMnS in which failed attempts to create/update aggregated Series Metadata will be retried. If absent, failed attempts will not be retried.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -1307,6 +1312,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmSeriesMetadataPollingInterval $
     dcmSeriesMetadataFetchSize $
     dcmSeriesMetadataThreads $
+    dcmSeriesMetadataRetryInterval $
     dcmPurgeInstanceRecords $
     dcmPurgeInstanceRecordsDelay $
     dcmPurgeInstanceRecordsPollingInterval $
@@ -1757,7 +1763,7 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.28 NAME 'hl7OrderSPSStatus'
     dcmSPSStatus $
     hl7OrderControlStatus ) )
 olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.29 NAME 'dcmAttributeSet'
-  DESC 'Named Attribute Set for Query Parameter "comparefield" of DIFF-RS and Query Parameter "includefields" of WADO-RS Metadata requests.'
+  DESC 'Named Attribute Set for Query Parameter "includefields" of QIDO-RS and WADO-RS Metadata or by Query Parameter "comparefield" of DIFF-RS requests.'
   SUP top STRUCTURAL
   MUST (
     dcmAttributeSetType $