Skip to content

Commit 23761ec

Browse files
committed
Switch ETLs to log row count discrepancies
1 parent 5c8c616 commit 23761ec

9 files changed

Lines changed: 31 additions & 2 deletions

File tree

PMR/resources/etls/prime-blooddraws.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<setting name="destSchema" value="study"/>
3535
<setting name="destQuery" value="blood"/>
3636
<setting name="destColumn" value="objectId"/>
37+
38+
<setting name="reportOnly" value="true"/>
3739
</settings>
3840
</taskref>
3941
</transform>

PMR/resources/etls/prime-chemistryResults.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<setting name="destSchema" value="study"/>
4141
<setting name="destQuery" value="chemistryResults"/>
4242
<setting name="destColumn" value="objectId"/>
43+
44+
<setting name="reportOnly" value="true"/>
4345
</settings>
4446
</taskref>
4547
</transform>

PMR/resources/etls/prime-clinpathRuns.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
<setting name="destSchema" value="study"/>
4242
<setting name="destQuery" value="clinpathRuns"/>
4343
<setting name="destColumn" value="objectId"/>
44+
45+
<setting name="reportOnly" value="true"/>
4446
</settings>
4547
</taskref>
4648
</transform>

PMR/resources/etls/prime-hematologyResults.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<setting name="destSchema" value="study"/>
4141
<setting name="destQuery" value="hematologyResults"/>
4242
<setting name="destColumn" value="objectId"/>
43+
44+
<setting name="reportOnly" value="true"/>
4345
</settings>
4446
</taskref>
4547
</transform>

PMR/resources/etls/prime-histology.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
<setting name="destSchema" value="study"/>
4040
<setting name="destQuery" value="histology"/>
4141
<setting name="destColumn" value="objectId"/>
42+
43+
<setting name="reportOnly" value="true"/>
4244
</settings>
4345
</taskref>
4446
</transform>

PMR/resources/etls/prime-microbiology.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<setting name="destSchema" value="study"/>
4141
<setting name="destQuery" value="microbiology"/>
4242
<setting name="destColumn" value="objectId"/>
43+
44+
<setting name="reportOnly" value="true"/>
4345
</settings>
4446
</taskref>
4547
</transform>

PMR/resources/etls/prime-pathologyDiagnoses.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
<setting name="destSchema" value="study"/>
3939
<setting name="destQuery" value="pathologyDiagnoses"/>
4040
<setting name="destColumn" value="objectId"/>
41+
42+
<setting name="reportOnly" value="true"/>
4143
</settings>
4244
</taskref>
4345
</transform>

PMR/resources/etls/prime-weight.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<setting name="destSchema" value="study"/>
3838
<setting name="destQuery" value="weight"/>
3939
<setting name="destColumn" value="objectId"/>
40+
41+
<setting name="reportOnly" value="true"/>
4042
</settings>
4143
</taskref>
4244
</transform>

primeseq/src/org/labkey/primeseq/etl/VerifyRowCount.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.labkey.primeseq.etl;
22

33
import org.apache.commons.lang3.StringUtils;
4+
import org.apache.logging.log4j.Level;
45
import org.apache.logging.log4j.Logger;
56
import org.jetbrains.annotations.NotNull;
67
import org.labkey.api.collections.CaseInsensitiveHashMap;
@@ -50,7 +51,8 @@ private enum Settings
5051
destSchema(true),
5152
destQuery(true),
5253
destColumn(true),
53-
destAdditionalFilters(false);
54+
destAdditionalFilters(false),
55+
reportOnly(false);
5456

5557
private final boolean _isRequired;
5658

@@ -106,6 +108,11 @@ public void setSettings(Map<String, String> settings)
106108
_settings.putAll(settings);
107109
}
108110

111+
private boolean isReportOnly()
112+
{
113+
return _settings.containsKey(Settings.reportOnly.name()) && Boolean.parseBoolean(_settings.get(Settings.reportOnly.name()));
114+
}
115+
109116
private DataIntegrationService.RemoteConnection getRemoteDataSource(String name, Container c, Logger log) throws IllegalStateException
110117
{
111118
DataIntegrationService.RemoteConnection rc = DataIntegrationService.get().getRemoteConnection(name, c, log);
@@ -259,7 +266,13 @@ private void verifyRows(PipelineJob job) throws PipelineJobException
259266

260267
if (source != dest)
261268
{
262-
job.getLogger().error("Row counts do not match (source: {}, dest: {})!", source, dest);
269+
if (isReportOnly()) {
270+
job.getLogger().info("Row counts do not match (source: {}, dest: {})!", source, dest);
271+
}
272+
else
273+
{
274+
job.getLogger().error("Row counts do not match (source: {}, dest: {})!", source, dest);
275+
}
263276
}
264277
}
265278
}

0 commit comments

Comments
 (0)