You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2021/07/11 07:26:00 UTC
[couchdb] branch fix/3362/latest-conflicts updated (9d96a0e ->
a8622f0)
This is an automated email from the ASF dual-hosted git repository.
jan pushed a change to branch fix/3362/latest-conflicts
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
discard 9d96a0e fix badmatch when fetching latest rev
discard 2624a8b chore: update dependency pointers to release tags
discard 70334b3 feat: somewhat hacky version detection
discard 233522c feat: update deps to support otp23 in a full build
discard 6423dcf feat: work around get_stacktrace deprecation/removal
discard 61f3879 feat(couchjs): add support for SpiderMonkey 86
add ae74720 Added override for COUCHDB_FAUXTON_DOCROOT (#3335)
add 1042374 feat(couchjs): add support for SpiderMonkey 86
add bfc25cc feat: work around get_stacktrace deprecation/removal
add 84eac8a feat: update deps to support otp23 in a full build
add 509663a feat: somewhat hacky version detection
add 1455975 chore: update dependency pointers to release tags
add 7e0661b chore: simplify version detection h/t @vatamane
add 1b7efad Fix error_logger reports for OTP >= 21
add a21fd40 Strip last_msg from logs
add e9f5cc6 Do not log sensitive data during _cluster_setup
add e630c44 Do not log admin credentials
add 19625a5 Strip proxy_url in replicator
add 663b314 Merge pull request #3380 from cloudant/clean-up-logs-3.x.v2
add 9cb1222 Remove stack traces on EXIT
add 27bb2c2 Merge pull request #3471 from cloudant/remove-stack-traces-on-EXIT
add 7ef98a9 Display name of tests
add f7528c8 Document strip_last_msg in default.ini
add 0144802 Make silly list configurable
add 96b782b Merge pull request #3489 from cloudant/configurable_filter_fields
add ca86ae1 Fix collation issue for older versions of libicu library
add 1842e8c Add support for Spidermonkey 78
add ed21b64 Support uri_file write for chttpd (#3428)
add a27f241 [CI] Move to new containers, expand Erlang matrix (#3504)
add 1d987ae [CI] Move to new containers for full build (#3505)
add 098c5a2 Add docker creds to CI run (#3508)
add 946ab2c Swap OTP_VERSION with OTP_RELEASE macro
add f790830 Add tests for password reqexp
add 5c1739f Add password validation
add b4939ff Test speed up
add ffe608a Switch show-test-results.py to use python 3
add 6fff405 Initial commit.
add 920d005 Squash Riaknostic commits prior to Weather Report fork
add 0ed0451 Port to CouchDB: Remove unwanted files
add 883276c Port to CouchDB: Rename src/riaknostic*
add c9924af Port to CouchDB: Remove targets from Makefile
add 0d0d98c Port to CouchDB: Update rebar.config
add 05069fe Port to CouchB: Modify to work with Apache CouchDB
add a7057e5 Port to CouchDB: Add weatherreport to .gitignore
add 665ddd1 Port to CouchDB: Remove travis build status
add 57f1c47 Port to CouchDB: Modify docs and comments
add 5d5f3ac Add documentation for adding checks
add 8cfb473 Add check for mem3_sync
add 778fe0b Add a check for processes with high mbox sizes
add 28fb1d5 Remove meck as a dependency
add 9ea8991 Include the node name when logging to stdout
add 3f843a2 Improve default etc directory
add 2940768 Fix unused variable warning
add 0264084 Add check for search availability
add ecde7fc Add check for shard safety/liveness
add dd57fe1 Add check for processes by first/current call
add abc9c53 Add check for IOQ active requests
add d937147 Optimize noatime check
add 90d0691 Allow checks to be run across the cluster
add f3514c7 Remove weatherreport_node:cluster_command funs
add ad06ec0 Route rpc checks via local cluster node
add b18e9f0 Handle cases where first/current call is undefined
add 372e6a6 Whitespace
add 67fd6f3 Make timeout for check-over-RPC configurable
add 69defe2 Improve logging of failed RPC calls
add 045692f Run local checks via RPC
add 5f95349 Run local checks via RPC
add 49bf9e1 Failed checks are turned into diagnostic messages
add 8f14524 Try to ensure writes to stdout are flushed
add 4737cd7 Add check for whether node can be safely rebuilt
add 49d1fde Add diagnostic check for TCP recv and send queues
add 9fb7d72 Generalise threshold checks on process attributes
add 01981c5 Diagnostic check for processes by memory usage
add d85d301 Remove rebar.config dependencies
add 0669cca Remove twig dependency
add 7f722fc Remove the getopt dependency
add 26e7521 Remove packaged rebar
add 6b988ae Remove unused function exports
add aeee603 Remove escriptize from all target
add 9231c11 Remove redundant rpc calls
add 1f4ed90 Don't include node name in diagnostic messages
add 73c724b there is no app
add aa6ed85 Handle conflicted shard maps
add b3272c7 Check number of pending internal replication jobs
add d09b502 Check mean node statistics over one second
add 97295cf Fix description of process_memory check
add 7375ba6 Downgrade process call count to notice
add 3afa803 Change s/cloudant/couchdb/g for maintenance_mode
add 4128812 Merge remote-tracking branch 'weatherreport/riaknostic-squash' into weatherreport
add 62e22e3 Port custom recon process call checks
add 532052e Support default IOQ in weatherreport
add 8617997 Change search check failure from error to warning
add ba03c8e Change header preamble to "derived from riaknostic"
add 54c880e Delete obsolete weatherreport files and documentation
add ad79f3c Update weatherreport documentation
add 5cbb4da Add getopt copyright to NOTICE
add 1199069 Crash if config app fails to start
add 1afcfc2 Build and escriptize weatherreport
add 88d1824 Merge pull request #3312 from apache/weatherreport
add 75a4a3ee Use correct args in get_doc_info
add a0603b7 Reformat build-aux/logfile-uploader.py (#3542)
add f672b91 Fix bug in Replicator authentication for password contains @
add a2afe79 Add offheap MQ support for dreyfus_index_manager (#3545)
add 7b85048 Bump ibrowse to 4.4.2 + couchdb patches
add e632b45 Erlang 24 support for 3.x branch
add f1dd5fe Moved some config options from httpd to chttpd
add d623134 Bump hyper dependency to 2.2.0-7
add 0bd9465 move couch_httpd_auth options to chttpd_auth 3.x
add ecd266b Improve basic auth credentials handling in replicator
add a5656ba Improve smoosh defaults for slack channel (#3600)
add e580d71 Bump ibrowse to 4.4.2-3
add 03ae438 Erlang 19 is not supported for 3.x
add 928fdc5 Bump ibrowse to 4.4.2-4 and mochiweb to v2.21.0
add cc646dc Bump ibrowse to 4.4.2-5
add 491b77d Improve robustness of chttpd_util_test
add 8ac1978 Fix custodian default system dbs
add dedd894 normalize some config options
add 9337019 Merge pull request #3609 from jiahuili430/normalise-config-options
add 3675e5e Use correct socks5 proxy ibrowse options
add d043258 Fix partitioned db shard recreation logic (#3633)
add 3245e9b 3.x build on ppc64le
add c05fd08 Port prometheus 3.x (#3506)
add a8622f0 fix badmatch when fetching latest rev
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9d96a0e)
\
N -- N -- N refs/heads/fix/3362/latest-conflicts (a8622f0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
Makefile | 19 +-
NOTICE | 4 +
build-aux/Jenkinsfile.full | 226 ++++----
build-aux/Jenkinsfile.pr | 21 +-
build-aux/logfile-uploader.py | 6 +-
build-aux/show-test-results.py | 70 +--
configure | 1 +
dev/run | 11 +-
rebar.config.script | 23 +-
rel/files/couchdb.in | 2 +-
rel/overlay/etc/default.ini | 215 ++++---
rel/reltool.config | 6 +
setup_eunit.template | 1 +
src/chttpd/src/chttpd.erl | 53 +-
src/chttpd/src/chttpd_auth_cache.erl | 2 +-
src/chttpd/src/chttpd_cors.erl | 2 +-
src/chttpd/src/chttpd_db.erl | 8 +-
src/chttpd/src/chttpd_external.erl | 3 +-
src/chttpd/src/chttpd_misc.erl | 2 +-
src/chttpd/src/chttpd_node.erl | 15 +-
src/chttpd/src/chttpd_prefer_header.erl | 8 +-
src/chttpd/src/chttpd_rewrite.erl | 15 +-
src/chttpd/src/chttpd_sup.erl | 77 ++-
src/chttpd/src/chttpd_util.erl | 62 ++
src/chttpd/src/chttpd_xframe_options.erl | 3 +-
src/chttpd/test/eunit/chttpd_util_test.erl | 113 ++++
src/couch/include/couch_db.hrl | 11 +-
.../priv/couch_ejson_compare/couch_ejson_compare.c | 40 ++
src/couch/rebar.config.script | 18 +-
src/couch/src/couch.app.src | 3 +-
src/couch/src/couch_changes.erl | 5 +-
src/couch/src/couch_db.erl | 14 +-
src/couch/src/couch_doc.erl | 2 +-
src/couch/src/couch_hotp.erl | 2 +-
src/couch/src/couch_httpd.erl | 56 +-
src/couch/src/couch_httpd_auth.erl | 68 +--
src/couch/src/couch_httpd_misc_handlers.erl | 6 +-
src/couch/src/couch_httpd_rewrite.erl | 16 +-
src/couch/src/couch_httpd_vhost.erl | 4 +-
src/couch/src/couch_passwords.erl | 10 +-
src/couch/src/couch_proc_manager.erl | 11 +-
src/couch/src/couch_query_servers.erl | 2 +-
src/couch/src/couch_server.erl | 32 +-
src/couch/src/couch_sup.erl | 51 --
src/couch/src/couch_users_db.erl | 87 ++-
src/couch/src/couch_util.erl | 26 +
src/couch/src/couch_uuids.erl | 2 +-
src/couch/test/eunit/couch_doc_json_tests.erl | 2 +-
src/couch/test/eunit/couch_js_tests.erl | 3 +-
src/couch/test/eunit/couchdb_cors_tests.erl | 2 +-
src/couch/test/eunit/couchdb_mrview_cors_tests.erl | 2 +-
src/couch_log/src/couch_log_config.erl | 31 +-
src/couch_log/src/couch_log_config_dyn.erl | 4 +-
src/couch_log/src/couch_log_formatter.erl | 31 +-
src/couch_log/src/couch_log_monitor.erl | 13 +
src/couch_log/src/couch_log_sup.erl | 4 +
src/couch_log/test/eunit/couch_log_config_test.erl | 79 ++-
.../test/eunit/couch_log_formatter_test.erl | 114 +++-
src/couch_mrview/src/couch_mrview_http.erl | 5 +-
.../src/couch_prometheus.app.src} | 8 +-
.../src/couch_prometheus.hrl} | 5 +-
.../src/couch_prometheus_app.erl} | 8 +-
src/couch_prometheus/src/couch_prometheus_http.erl | 102 ++++
.../src/couch_prometheus_server.erl | 174 ++++++
.../src/couch_prometheus_sup.erl} | 14 +-
src/couch_prometheus/src/couch_prometheus_util.erl | 166 ++++++
.../test/eunit/couch_prometheus_e2e_tests.erl | 147 +++++
.../test/eunit/couch_prometheus_util_tests.erl | 65 +++
src/couch_replicator/src/couch_replicator.erl | 10 +-
.../src/couch_replicator_auth_session.erl | 152 +----
.../src/couch_replicator_connection.erl | 5 +-
src/couch_replicator/src/couch_replicator_docs.erl | 82 ++-
.../src/couch_replicator_httpc.erl | 8 +-
.../src/couch_replicator_httpc_pool.erl | 31 +-
src/couch_replicator/src/couch_replicator_ids.erl | 78 +--
.../src/couch_replicator_scheduler_job.erl | 4 +-
.../src/couch_replicator_utils.erl | 271 ++++++++-
...replicator_create_target_with_options_tests.erl | 4 +-
...ch_replicator_small_max_request_size_target.erl | 2 +-
src/custodian/src/custodian_db_checker.erl | 2 +-
src/custodian/src/custodian_util.erl | 4 +-
src/dreyfus/src/dreyfus_index_manager.erl | 1 +
src/dreyfus/src/dreyfus_rpc.erl | 11 +-
src/fabric/src/fabric_doc_attachments.erl | 4 +-
src/fabric/src/fabric_doc_atts.erl | 4 +-
src/fabric/src/fabric_rpc.erl | 4 +-
src/fabric/src/fabric_util.erl | 2 +-
.../test/eunit/global_changes_hooks_tests.erl | 4 +-
src/ioq/src/ioq.erl | 24 +-
src/jwtf/src/jwtf.erl | 29 +-
src/mango/rebar.config.script | 3 +-
src/mem3/src/mem3.erl | 2 +-
src/mem3/src/mem3_rpc.erl | 2 +-
src/mem3/src/mem3_shards.erl | 14 +-
src/mem3/src/mem3_util.erl | 64 ++-
src/mem3/test/eunit/mem3_shards_test.erl | 129 +++++
src/mem3/test/eunit/mem3_util_test.erl | 2 +-
src/setup/src/setup.erl | 2 +-
src/setup/src/setup_httpd.erl | 19 +-
src/smoosh/src/smoosh_server.erl | 10 +-
src/weatherreport/.gitignore | 13 +
src/weatherreport/.manifest | 5 +
src/{jwtf => weatherreport}/LICENSE | 2 +
src/weatherreport/README.md | 81 +++
src/weatherreport/how_to_add_a_check.md | 113 ++++
src/weatherreport/rebar.config | 31 +
src/weatherreport/src/weatherreport.app.src | 39 ++
src/weatherreport/src/weatherreport.erl | 181 ++++++
src/weatherreport/src/weatherreport_check.erl | 107 ++++
.../src/weatherreport_check_custodian.erl | 82 +++
src/weatherreport/src/weatherreport_check_disk.erl | 172 ++++++
.../weatherreport_check_internal_replication.erl | 57 ++
src/weatherreport/src/weatherreport_check_ioq.erl | 95 ++++
.../src/weatherreport_check_mem3_sync.erl | 55 ++
.../src/weatherreport_check_membership.erl | 65 +++
.../src/weatherreport_check_memory_use.erl | 67 +++
.../src/weatherreport_check_message_queues.erl | 57 ++
.../src/weatherreport_check_node_stats.erl | 66 +++
.../src/weatherreport_check_nodes_connected.erl | 59 ++
.../src/weatherreport_check_process_calls.erl | 153 +++++
.../src/weatherreport_check_process_memory.erl | 57 ++
.../src/weatherreport_check_safe_to_rebuild.erl | 116 ++++
.../src/weatherreport_check_search.erl | 58 ++
.../src/weatherreport_check_tcp_queues.erl | 89 +++
src/weatherreport/src/weatherreport_config.erl | 196 +++++++
src/weatherreport/src/weatherreport_getopt.erl | 621 +++++++++++++++++++++
src/weatherreport/src/weatherreport_log.erl | 69 +++
src/weatherreport/src/weatherreport_node.erl | 208 +++++++
src/weatherreport/src/weatherreport_runner.erl | 89 +++
src/weatherreport/src/weatherreport_util.erl | 111 ++++
support/build_js.escript | 14 +-
test/elixir/lib/step/user.ex | 2 +-
test/elixir/test/changes_test.exs | 2 +-
test/elixir/test/config_test.exs | 34 +-
test/elixir/test/cookie_auth_test.exs | 2 +-
test/elixir/test/http_test.exs | 2 +-
test/elixir/test/jsonp_test.exs | 4 +-
test/elixir/test/proxyauth_test.exs | 6 +-
test/elixir/test/rewrite_test.exs | 10 +-
test/elixir/test/users_db_security_test.exs | 2 +-
test/elixir/test/users_db_test.exs | 127 ++++-
test/javascript/tests/replicator_db_by_doc_id.js | 2 +-
test/javascript/tests/rewrite.js | 10 +-
143 files changed, 5907 insertions(+), 820 deletions(-)
create mode 100644 src/chttpd/src/chttpd_util.erl
create mode 100644 src/chttpd/test/eunit/chttpd_util_test.erl
copy src/{couch_mrview/src/couch_mrview.app.src => couch_prometheus/src/couch_prometheus.app.src} (71%)
copy src/{fabric/rebar.config => couch_prometheus/src/couch_prometheus.hrl} (89%)
copy src/{ddoc_cache/src/ddoc_cache_app.erl => couch_prometheus/src/couch_prometheus_app.erl} (90%)
create mode 100644 src/couch_prometheus/src/couch_prometheus_http.erl
create mode 100644 src/couch_prometheus/src/couch_prometheus_server.erl
copy src/{couch_stats/src/couch_stats_sup.erl => couch_prometheus/src/couch_prometheus_sup.erl} (71%)
create mode 100644 src/couch_prometheus/src/couch_prometheus_util.erl
create mode 100644 src/couch_prometheus/test/eunit/couch_prometheus_e2e_tests.erl
create mode 100644 src/couch_prometheus/test/eunit/couch_prometheus_util_tests.erl
create mode 100644 src/mem3/test/eunit/mem3_shards_test.erl
create mode 100644 src/weatherreport/.gitignore
create mode 100644 src/weatherreport/.manifest
copy src/{jwtf => weatherreport}/LICENSE (99%)
create mode 100644 src/weatherreport/README.md
create mode 100644 src/weatherreport/how_to_add_a_check.md
create mode 100644 src/weatherreport/rebar.config
create mode 100644 src/weatherreport/src/weatherreport.app.src
create mode 100644 src/weatherreport/src/weatherreport.erl
create mode 100644 src/weatherreport/src/weatherreport_check.erl
create mode 100644 src/weatherreport/src/weatherreport_check_custodian.erl
create mode 100644 src/weatherreport/src/weatherreport_check_disk.erl
create mode 100644 src/weatherreport/src/weatherreport_check_internal_replication.erl
create mode 100644 src/weatherreport/src/weatherreport_check_ioq.erl
create mode 100644 src/weatherreport/src/weatherreport_check_mem3_sync.erl
create mode 100644 src/weatherreport/src/weatherreport_check_membership.erl
create mode 100644 src/weatherreport/src/weatherreport_check_memory_use.erl
create mode 100644 src/weatherreport/src/weatherreport_check_message_queues.erl
create mode 100644 src/weatherreport/src/weatherreport_check_node_stats.erl
create mode 100644 src/weatherreport/src/weatherreport_check_nodes_connected.erl
create mode 100644 src/weatherreport/src/weatherreport_check_process_calls.erl
create mode 100644 src/weatherreport/src/weatherreport_check_process_memory.erl
create mode 100644 src/weatherreport/src/weatherreport_check_safe_to_rebuild.erl
create mode 100644 src/weatherreport/src/weatherreport_check_search.erl
create mode 100644 src/weatherreport/src/weatherreport_check_tcp_queues.erl
create mode 100644 src/weatherreport/src/weatherreport_config.erl
create mode 100644 src/weatherreport/src/weatherreport_getopt.erl
create mode 100644 src/weatherreport/src/weatherreport_log.erl
create mode 100644 src/weatherreport/src/weatherreport_node.erl
create mode 100644 src/weatherreport/src/weatherreport_runner.erl
create mode 100644 src/weatherreport/src/weatherreport_util.erl