-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NIFI-4069: Make ListXXX work with timestamp precision in seconds or m…
…inutes - Refactored variable names to better represents what those are meant for. - Added deterministic logic which detects target filesystem timestamp precision and adjust lag time based on it. - Changed from using System.nanoTime() to System.currentTimeMillis in test because Java File API reports timestamp in milliseconds at the best granularity. Also, System.nanoTime should not be used in mix with epoch milliseconds because it uses arbitrary origin and measured differently. - Changed TestListFile to use more longer interval between file timestamps those are used by testFilterAge to provide more consistent test result because sleep time can be longer with filesystems whose timestamp in seconds precision. - Added logging at TestListFile. - Added TestWatcher to dump state in case assertion fails for further investigation. - Added Timestamp Precision property so that user can set if auto-detect is not enough - Adjust timestamps for ages test This closes #1915. Signed-off-by: Bryan Bende <bbende@apache.org>
- Loading branch information
1 parent
a4e729c
commit 28ee702
Showing
9 changed files
with
463 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
161 changes: 115 additions & 46 deletions
161
...cessor-utils/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
Large diffs are not rendered by default.
Oops, something went wrong.
128 changes: 128 additions & 0 deletions
128
...sor-utils/src/main/java/org/apache/nifi/processor/util/list/ListProcessorTestWatcher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.nifi.processor.util.list; | ||
|
||
import org.apache.nifi.flowfile.FlowFile; | ||
import org.apache.nifi.flowfile.attributes.CoreAttributes; | ||
import org.junit.rules.TestWatcher; | ||
import org.junit.runner.Description; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import java.text.SimpleDateFormat; | ||
import java.util.Comparator; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.function.Consumer; | ||
import java.util.stream.Collectors; | ||
|
||
/** | ||
* This class provides a way to dump list-able entities, processor state and transferred FlowFiles into 'success' relationship, | ||
* which is useful to debug test issues especially at automation test environment such as Travis that is difficult to debug. | ||
*/ | ||
public class ListProcessorTestWatcher extends TestWatcher { | ||
|
||
private static final Logger logger = LoggerFactory.getLogger(ListProcessorTestWatcher.class); | ||
private static final Consumer<String> logStateDump = logger::info; | ||
|
||
@FunctionalInterface | ||
public interface Provider<T> { | ||
T provide(); | ||
} | ||
|
||
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); | ||
private final Provider<Map<String, String>> stateMapProvider; | ||
private final Provider<List<ListableEntity>> entitiesProvider; | ||
private final Provider<List<FlowFile>> successFlowFilesProvider; | ||
|
||
private long startedAtMillis; | ||
|
||
public ListProcessorTestWatcher(Provider<Map<String, String>> stateMapProvider, Provider<List<ListableEntity>> entitiesProvider, Provider<List<FlowFile>> successFlowFilesProvider) { | ||
this.stateMapProvider = stateMapProvider; | ||
this.entitiesProvider = entitiesProvider; | ||
this.successFlowFilesProvider = successFlowFilesProvider; | ||
} | ||
|
||
private void log(Consumer<String> dumper, String format, Object ... args) { | ||
dumper.accept(String.format(format, args)); | ||
} | ||
|
||
public void dumpState(final long start) { | ||
dumpState(logStateDump, stateMapProvider.provide(), entitiesProvider.provide(), successFlowFilesProvider.provide(), start); | ||
} | ||
|
||
private void dumpState(Consumer<String> d, final Map<String, String> state, final List<ListableEntity> entities, final List<FlowFile> flowFiles, final long start) { | ||
|
||
final long nTime = System.currentTimeMillis(); | ||
log(d, "--------------------------------------------------------------------"); | ||
log(d, "%-19s %-13s %-23s %s", "", "timestamp", "date from timestamp", "t0 delta"); | ||
log(d, "%-19s %-13s %-23s %s", "-------------------", "-------------", "-----------------------", "--------"); | ||
log(d, "%-19s = %13d %s %8d", "started at", start, dateFormat.format(start), 0); | ||
log(d, "%-19s = %13d %s %8d", "current time", nTime, dateFormat.format(nTime), 0); | ||
log(d, "---- processor state -----------------------------------------------"); | ||
if (state.containsKey("processed.timestamp")) { | ||
final long pTime = Long.parseLong(state.get("processed.timestamp")); | ||
log(d, "%19s = %13d %s %8d", "processed.timestamp", pTime, dateFormat.format(pTime), pTime - nTime); | ||
} else { | ||
log(d, "%19s = na", "processed.timestamp"); | ||
} | ||
if (state.containsKey("listing.timestamp")) { | ||
final long lTime = Long.parseLong(state.get("listing.timestamp")); | ||
log(d, "%19s = %13d %s %8d", "listing.timestamp", lTime, dateFormat.format(lTime), lTime - nTime); | ||
} else { | ||
log(d, "%19s = na", "listing.timestamp"); | ||
} | ||
log(d, "---- input folder contents -----------------------------------------"); | ||
entities.sort(Comparator.comparing(ListableEntity::getIdentifier)); | ||
for (ListableEntity entity : entities) { | ||
log(d, "%19s = %12d %s %8d", entity.getIdentifier(), entity.getTimestamp(), dateFormat.format(entity.getTimestamp()), entity.getTimestamp() - nTime); | ||
} | ||
log(d, "---- output flowfiles ----------------------------------------------"); | ||
final Map<String, Long> fileTimes = entities.stream().collect(Collectors.toMap(ListableEntity::getIdentifier, ListableEntity::getTimestamp)); | ||
for (FlowFile ff : flowFiles) { | ||
String fName = ff.getAttribute(CoreAttributes.FILENAME.key()); | ||
Long fTime = fileTimes.get(fName); | ||
log(d, "%19s = %13d %s %8d", fName, fTime, dateFormat.format(fTime), fTime - nTime); | ||
} | ||
log(d, "REL_SUCCESS count = " + flowFiles.size()); | ||
log(d, "--------------------------------------------------------------------"); | ||
log(d, ""); | ||
} | ||
|
||
@Override | ||
protected void starting(Description description) { | ||
startedAtMillis = System.currentTimeMillis(); | ||
} | ||
|
||
/** | ||
* Throw additional AssertionError with stateDump as its message. | ||
*/ | ||
@Override | ||
protected void failed(Throwable e, Description description) { | ||
if (!(e instanceof AssertionError)) { | ||
return; | ||
} | ||
|
||
final StringBuilder msg = new StringBuilder("State dump:\n"); | ||
dumpState(s -> msg.append(s).append("\n"), | ||
stateMapProvider.provide(), | ||
entitiesProvider.provide(), | ||
successFlowFilesProvider.provide(), | ||
startedAtMillis); | ||
throw new AssertionError(msg); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.