Merge remote-tracking branch 'couchbase/3.0.x' into 'couchbase/sherlock' 11/60711/1
authorJim Walker <jim@couchbase.com>
Tue, 1 Mar 2016 12:34:11 +0000 (12:34 +0000)
committerJim Walker <jim@couchbase.com>
Tue, 1 Mar 2016 12:35:37 +0000 (12:35 +0000)
* couchbase/3.0.x:
  MB-17889: No notify from streamRequest
  MB-17889: Address view_query latency regression

Change-Id: Ib1a5c25fccdfddc85e6072ec1d6831569c84128f

1  2 
configuration.json
src/dcp-producer.cc

              "dynamic": false,
              "type": "size_t"
          },
 +        "dcp_scan_byte_limit": {
 +            "default": "4194304",
 +            "descr": "Max bytes that can be read in a single disk scan",
 +            "dynamic": false,
 +            "type": "size_t"
 +        },
 +        "dcp_scan_item_limit": {
 +            "default": "4096",
 +            "descr": "Max items that can be read in a single disk scan",
 +            "dynamic": false,
 +            "type": "size_t"
 +        },
          "dcp_producer_snapshot_marker_yield_limit": {
-             "default": "256",
+             "default": "10",
              "descr": "The number of snapshots before ActiveStreamCheckpointProcessorTask::run yields.",
              "type": "size_t"
          },
Simple merge