This is an automated email from the ASF dual-hosted git repository. nehapawar pushed a commit to branch split_vm_tasks_2 in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 1e58eed1e89e91e3b95272415863f4127f796346 Author: Neha Pawar <[email protected]> AuthorDate: Mon Jan 7 09:56:29 2019 -0800 Move some code inside the if check for table type --- .../validation/OfflineSegmentIntervalChecker.java | 12 ++++++----- .../RealtimeSegmentValidationManager.java | 24 ++++++++++++---------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/OfflineSegmentIntervalChecker.java b/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/OfflineSegmentIntervalChecker.java index 8695353..592bd0a 100644 --- a/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/OfflineSegmentIntervalChecker.java +++ b/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/OfflineSegmentIntervalChecker.java @@ -64,14 +64,16 @@ public class OfflineSegmentIntervalChecker extends ControllerPeriodicTask { @Override protected void processTable(String tableNameWithType) { try { - TableConfig tableConfig = _pinotHelixResourceManager.getTableConfig(tableNameWithType); - if (tableConfig == null) { - LOGGER.warn("Failed to find table config for table: {}, skipping validation", tableNameWithType); - return; - } CommonConstants.Helix.TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType); if (tableType == CommonConstants.Helix.TableType.OFFLINE) { + + TableConfig tableConfig = _pinotHelixResourceManager.getTableConfig(tableNameWithType); + if (tableConfig == null) { + LOGGER.warn("Failed to find table config for table: {}, skipping validation", tableNameWithType); + return; + } + validateOfflineSegmentPush(tableConfig); } } catch (Exception e) { diff --git a/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/RealtimeSegmentValidationManager.java b/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/RealtimeSegmentValidationManager.java index 42208e7..36d7b27 100644 --- a/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/RealtimeSegmentValidationManager.java +++ b/pinot-controller/src/main/java/com/linkedin/pinot/controller/validation/RealtimeSegmentValidationManager.java @@ -76,22 +76,24 @@ public class RealtimeSegmentValidationManager extends ControllerPeriodicTask { @Override protected void processTable(String tableNameWithType) { try { - TableConfig tableConfig = _pinotHelixResourceManager.getTableConfig(tableNameWithType); - if (tableConfig == null) { - LOGGER.warn("Failed to find table config for table: {}, skipping validation", tableNameWithType); - return; - } - CommonConstants.Helix.TableType tableType = TableNameBuilder.getTableTypeFromTableName(tableNameWithType); if (tableType == CommonConstants.Helix.TableType.REALTIME) { + + TableConfig tableConfig = _pinotHelixResourceManager.getTableConfig(tableNameWithType); + if (tableConfig == null) { + LOGGER.warn("Failed to find table config for table: {}, skipping validation", tableNameWithType); + return; + } + if (_updateRealtimeDocumentCount) { updateRealtimeDocumentCount(tableConfig); } - } - Map<String, String> streamConfigMap = tableConfig.getIndexingConfig().getStreamConfigs(); - StreamConfig streamConfig = new StreamConfig(streamConfigMap); - if (streamConfig.hasLowLevelConsumerType()) { - _llcRealtimeSegmentManager.validateLLCSegments(tableConfig); + + Map<String, String> streamConfigMap = tableConfig.getIndexingConfig().getStreamConfigs(); + StreamConfig streamConfig = new StreamConfig(streamConfigMap); + if (streamConfig.hasLowLevelConsumerType()) { + _llcRealtimeSegmentManager.validateLLCSegments(tableConfig); + } } } catch (Exception e) { LOGGER.warn("Caught exception while validating realtime table: {}", tableNameWithType, e); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
