You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/06/24 21:15:48 UTC
[1/2] incubator-metron git commit: METRON-256: Make the PCap values
returned ordered by timestamp. This closes apache/incubator-metron#173
[Forced Update!]
Repository: incubator-metron
Updated Branches:
refs/heads/master e08ec405c -> eaa58bdf0 (forced update)
Updated Tags: refs/tags/Metron_0.2.0BETA_rc2 b1579bffc -> 667d04990
METRON-256: Make the PCap values returned ordered by timestamp. This closes apache/incubator-metron#173
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/667d0499
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/667d0499
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/667d0499
Branch: refs/heads/master
Commit: 667d049909ee37e7df73b9fd520bc00f7e7fed17
Parents: 05926e0
Author: cstella <ce...@gmail.com>
Authored: Fri Jun 24 12:26:25 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Fri Jun 24 12:26:25 2016 -0400
----------------------------------------------------------------------
.../PcapTopologyIntegrationTest.java | 23 ++++++++++++++++++++
.../java/org/apache/metron/pcap/mr/PcapJob.java | 1 +
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/667d0499/metron-platform/metron-pcap-backend/src/test/java/org/apache/metron/pcap/integration/PcapTopologyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-pcap-backend/src/test/java/org/apache/metron/pcap/integration/PcapTopologyIntegrationTest.java b/metron-platform/metron-pcap-backend/src/test/java/org/apache/metron/pcap/integration/PcapTopologyIntegrationTest.java
index 03e3639..8fcdeed 100644
--- a/metron-platform/metron-pcap-backend/src/test/java/org/apache/metron/pcap/integration/PcapTopologyIntegrationTest.java
+++ b/metron-platform/metron-pcap-backend/src/test/java/org/apache/metron/pcap/integration/PcapTopologyIntegrationTest.java
@@ -281,6 +281,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new FixedPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), 2);
}
{
@@ -296,6 +297,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new QueryPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), 2);
}
{
@@ -312,6 +314,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new FixedPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), 0);
}
{
@@ -327,6 +330,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new QueryPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), 0);
}
{
@@ -343,6 +347,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new FixedPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), 0);
}
{
@@ -358,6 +363,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new QueryPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), 0);
}
{
@@ -372,6 +378,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new FixedPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), pcapEntries.size());
}
{
@@ -387,6 +394,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new QueryPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertEquals(results.size(), pcapEntries.size());
}
{
@@ -402,6 +410,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new FixedPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertTrue(results.size() > 0);
Assert.assertEquals(results.size()
, Iterables.size(filterPcaps(pcapEntries, new Predicate<JSONObject>() {
@@ -429,6 +438,7 @@ public class PcapTopologyIntegrationTest {
, FileSystem.get(new Configuration())
, new QueryPcapFilter.Configurator()
);
+ assertInOrder(results);
Assert.assertTrue(results.size() > 0);
Assert.assertEquals(results.size()
, Iterables.size(filterPcaps(pcapEntries, new Predicate<JSONObject>() {
@@ -440,6 +450,7 @@ public class PcapTopologyIntegrationTest {
}, withHeaders)
)
);
+ assertInOrder(results);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PcapMerger.merge(baos, results);
Assert.assertTrue(baos.toByteArray().length > 0);
@@ -452,6 +463,18 @@ public class PcapTopologyIntegrationTest {
}
}
+ public static void assertInOrder(Iterable<byte[]> packets) {
+ long previous = 0;
+ for(byte[] packet : packets) {
+ for(JSONObject json : TO_JSONS.apply(packet)) {
+ Long current = Long.parseLong(json.get("ts_micro").toString());
+ Assert.assertNotNull(current);
+ Assert.assertTrue(Long.compareUnsigned(current, previous) >= 0);
+ previous = current;
+ }
+ }
+ }
+
public static Function<byte[], Iterable<JSONObject>> TO_JSONS = new Function<byte[], Iterable<JSONObject>>() {
@Nullable
@Override
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/667d0499/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java b/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
index 3543b1d..a181637 100644
--- a/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
+++ b/metron-platform/metron-pcap/src/main/java/org/apache/metron/pcap/mr/PcapJob.java
@@ -224,6 +224,7 @@ public class PcapJob {
job.setMapperClass(PcapJob.PcapMapper.class);
job.setMapOutputKeyClass(LongWritable.class);
job.setMapOutputValueClass(BytesWritable.class);
+ job.setNumReduceTasks(1);
job.setReducerClass(PcapReducer.class);
job.setOutputKeyClass(LongWritable.class);
job.setOutputValueClass(BytesWritable.class);
[2/2] incubator-metron git commit: Cleaning for the release.
Posted by ce...@apache.org.
Cleaning for the release.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/eaa58bdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/eaa58bdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/eaa58bdf
Branch: refs/heads/master
Commit: eaa58bdf0d90bdb427fb0b02db83aabb92c9dbab
Parents: 667d049
Author: cstella <ce...@gmail.com>
Authored: Fri Jun 24 17:13:00 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Fri Jun 24 17:13:00 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------