Merge pull request #182 from splunk/bug/DVPL-7204-distributed-search

Fix Configuration(distributed=True) resulting in a command that is NOT distributed

Author: shakeelmohamed

splunklib/searchcommands/generating_command.py

@@ -320,7 +320,7 @@ def iteritems(self):
             version = self.command.protocol_version
             if version == 2:
                 iteritems = ifilter(lambda (name, value): name != 'distributed', iteritems)
-                if self.distributed and self.type == 'streaming':
+                if not self.distributed and self.type == 'streaming':
                     iteritems = imap(
                         lambda (name, value): (name, 'stateful') if name == 'type' else (name, value), iteritems)
             return iteritems

splunklib/searchcommands/streaming_command.py

@@ -180,7 +180,7 @@ def iteritems(self):
                     iteritems = ifilter(lambda (name, value): name != 'clear_required_fields', iteritems)
             else:
                 iteritems = ifilter(lambda (name, value): name != 'distributed', iteritems)
-                if self.distributed:
+                if not self.distributed:
                     iteritems = imap(
                         lambda (name, value): (name, 'stateful') if name == 'type' else (name, value), iteritems)
             return iteritems

tests/searchcommands/recordings/scpv2/Splunk-6.3/countmatches.output

@@ -1,5 +1,5 @@
-chunked 1.0,19,0
-{"type":"stateful"}
+chunked 1.0,20,0
+{"type":"streaming"}
 chunked 1.0,17,49651
 {"finished":true}_serial,__mv__serial,_time,__mv__time,text,__mv_text,word_count,__mv_word_count
 0,,1380899494,,excellent review my friend loved it yours always guppyman @GGreeny62... http://t.co/fcvq7NDHxl,,14,

tests/searchcommands/recordings/scpv2/Splunk-6.3/generatehello.output

@@ -1,5 +1,5 @@
 chunked 1.0,38,0
-{"generating":true,"type":"streaming"}
+{"generating":true,"type":"stateful"}
 chunked 1.0,17,37842
 {"finished":true}_time,__mv__time,event_no,__mv_event_no,_raw,__mv__raw
 1500765588.65,,1,,Hello World 1,

tests/searchcommands/recordings/scpv2/Splunk-6.3/sum.map.output

@@ -1,5 +1,6 @@
-chunked 1.0,19,0
-{"type":"stateful"}
+chunked 1.0,20,0
+{"type":"streaming"}
 chunked 1.0,17,34
 {"finished":true}total,__mv_total
 2147943.07811,
+

tests/searchcommands/test_configuration_settings.py

@@ -77,7 +77,7 @@ def generate(self):
 
         self.assertEqual(
             [(name, value) for name, value in command.configuration.iteritems()],
-            [('generating', True), ('type', 'streaming')])
+            [('generating', True), ('type', 'stateful')])
 
         self.assertIs(command.configuration.distributed, False)
         self.assertIs(command.configuration.generating, True)
@@ -96,7 +96,7 @@ def generate(self):
 
         self.assertEqual(
             [(name, value) for name, value in command.configuration.iteritems()],
-            [('generating', True), ('type', 'stateful')])
+            [('generating', True), ('type', 'streaming')])
 
         return
 
@@ -146,7 +146,7 @@ def stream(self, records):
 
         self.assertEqual(
             [(name, value) for name, value in command.configuration.iteritems()],
-            [('type', 'stateful')])
+            [('type', 'streaming')])
 
         self.assertIs(command.configuration.distributed, True)
         self.assertEqual(command.configuration.type, 'streaming')
@@ -165,7 +165,7 @@ def stream(self, records):
 
         self.assertEqual(
             [(name, value) for name, value in command.configuration.iteritems()],
-            [('required_fields', ['field_1', 'field_2', 'field_3']), ('type', 'streaming')])
+            [('required_fields', ['field_1', 'field_2', 'field_3']), ('type', 'stateful')])
 
         return
 

tests/searchcommands/test_searchcommands_app.py

@@ -263,7 +263,10 @@ def assertInfoEqual(self, output, expected):
 
         self.assertDictEqual(expected, output)
 
-    def _compare_chunks(self, expected, output, time_sensitive = True):
+    def _compare_chunks(self, expected, output, time_sensitive=True):
+
+        expected = expected.strip()
+        output = output.strip()
 
         if time_sensitive:
             self.assertEqual(len(expected), len(output))