Skip to content

Commit 0abcf3f

Browse files
authored
Merge pull request #81 from CluedIn-io/fix/44195-prevent-unnecessary-warning
fix: Do not output warning logs when job is not present in job queue
2 parents 4f89e87 + a5817b1 commit 0abcf3f

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

docs/4.4.1-release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
### Fixes
2+
- Prevent unnecessary warning messages when using sync mode with stream cache disabled
23
- Add option to enable or disable escaping of non a-z,A-Z,0-9,_ characters
34
- Add option to enable or disable writing of guids as strings

src/Connector.DataLake.Common/DataLakeScheduler.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ async Task addStreamExportJobs(ExecutionContext executionContext, ProviderDefini
4848
if (stream.Mode != StreamMode.Sync)
4949
{
5050
_logger.LogDebug("Stream {StreamId} is not in {Mode} mode. Removing it from scheduler '{SchedulerName}'.", stream.Id, StreamMode.Sync, _schedulerName);
51-
removeExportJob(jobKey);
51+
removeExportJob(jobKey, warnIfNotRemoved: false);
5252
return;
5353
}
5454

5555
var jobSchedule = await _dataLakeJobDataFactory.GetScheduleAsync(executionContext, stream);
5656
if (IsExportJobDisabled(jobSchedule))
5757
{
58-
_logger.LogDebug("Stream {StreamId} is disabled. Removing it from scheduler '{SchedulerName}'.", stream.Id, _schedulerName);
59-
removeExportJob(jobKey);
58+
_logger.LogDebug("Stream {StreamId} export is disabled. Removing it from scheduler '{SchedulerName}'.", stream.Id, _schedulerName);
59+
removeExportJob(jobKey, warnIfNotRemoved: false);
6060
return;
6161
}
6262

@@ -72,7 +72,7 @@ async Task addStreamExportJobs(ExecutionContext executionContext, ProviderDefini
7272
var removed = 0;
7373
foreach (var jobKey in jobKeysToRemove)
7474
{
75-
removeExportJob(jobKey);
75+
removeExportJob(jobKey, warnIfNotRemoved: true);
7676
removed++;
7777
}
7878

@@ -81,15 +81,15 @@ async Task addStreamExportJobs(ExecutionContext executionContext, ProviderDefini
8181
_logger.LogInformation("Total of obsolete {RemovedCount} stream jobs removed from scheduler '{SchedulerName}'.", removed, _schedulerName);
8282
}
8383

84-
void removeExportJob(string jobKey)
84+
void removeExportJob(string jobKey, bool warnIfNotRemoved)
8585
{
8686
if (jobQueue.TryRemove(jobKey, out var _))
8787
{
8888
_logger.LogDebug("Stream export for stream {StreamId} removed from scheduler '{SchedulerName}'.", jobKey, _schedulerName);
8989
}
90-
else
90+
else if (warnIfNotRemoved)
9191
{
92-
_logger.LogWarning("Failed to disable stream export for stream {StreamId} from scheduler '{SchedulerName}'..", jobKey, _schedulerName);
92+
_logger.LogWarning("Failed to disable stream export for stream {StreamId} from scheduler '{SchedulerName}'.", jobKey, _schedulerName);
9393
}
9494
}
9595
}

0 commit comments

Comments
 (0)