diff options
| -rw-r--r-- | doc/ci/yaml/README.md | 4 | ||||
| -rw-r--r-- | doc/integration/elasticsearch.md | 14 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb | 3 |
3 files changed, 12 insertions, 9 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index cdd8cecbf8e..f0f72875ee5 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -469,7 +469,9 @@ Jobs will run on your own Runners in parallel only if: ### `only`/`except` (basic) NOTE: **Note:** -These parameters will soon be [deprecated](https://gitlab.com/gitlab-org/gitlab/issues/27449) in favor of [`rules`](#rules) as it offers a more powerful syntax. +The [`rules`](#rules) syntax is now the preferred method of setting job policies. +`only` and `except` are [candidates for deprecation](https://gitlab.com/gitlab-org/gitlab/issues/27449), +and may be removed in the future. `only` and `except` are two parameters that set a job policy to limit when jobs are created: diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md index da1be91dfb7..62b3de72a3a 100644 --- a/doc/integration/elasticsearch.md +++ b/doc/integration/elasticsearch.md @@ -273,7 +273,7 @@ or creating [extra Sidekiq processes](../administration/operations/extra_sidekiq decrease in indexing time. We'll enable them when indexing is done. This step is optional! ```bash - curl --request PUT localhost:9200/gitlab-production/_settings --data '{ + curl --request PUT localhost:9200/gitlab-production/_settings --header 'Content-Type: application/json' --data '{ "index" : { "refresh_interval" : "-1", "number_of_replicas" : 0 @@ -355,7 +355,7 @@ or creating [extra Sidekiq processes](../administration/operations/extra_sidekiq 1. Enable replication and refreshing again after indexing (only if you previously disabled it): ```bash - curl --request PUT localhost:9200/gitlab-production/_settings --data '{ + curl --request PUT localhost:9200/gitlab-production/_settings --header 'Content-Type: application/json' ---data '{ "index" : { "number_of_replicas" : 1, "refresh_interval" : "1s" @@ -367,7 +367,7 @@ or creating [extra Sidekiq processes](../administration/operations/extra_sidekiq For Elasticsearch 6.x, the index should be in read-only mode before proceeding with the force merge: ```bash - curl --request PUT localhost:9200/gitlab-production/_settings --data '{ + curl --request PUT localhost:9200/gitlab-production/_settings ---header 'Content-Type: application/json' --data '{ "settings": { "index.blocks.write": true } }' @@ -376,13 +376,13 @@ or creating [extra Sidekiq processes](../administration/operations/extra_sidekiq Then, initiate the force merge: ```bash - curl --request POST 'http://localhost:9200/gitlab-production/_forcemerge?max_num_segments=5' + curl --request POST 'localhost:9200/gitlab-production/_forcemerge?max_num_segments=5' ``` After this, if your index is in read-only mode, switch back to read-write: ```bash - curl --request PUT localhost:9200/gitlab-production/_settings --data '{ + curl --request PUT localhost:9200/gitlab-production/_settings ---header 'Content-Type: application/json' --data '{ "settings": { "index.blocks.write": false } }' @@ -470,7 +470,7 @@ However, some larger installations may wish to tune the merge policy settings: - Consider reducing the `index.merge.policy.max_merged_segment` size from the default 5 GB to maybe 2 GB or 3 GB. Merging only happens when a segment has at least 50% deletions. Smaller segment sizes will allow merging to happen more frequently. ```bash - curl --request PUT http://localhost:9200/gitlab-production/_settings --data '{ + curl --request PUT localhost:9200/gitlab-production/_settings ---header 'Content-Type: application/json' --data '{ "index" : { "merge.policy.max_merged_segment": "2gb" } @@ -480,7 +480,7 @@ However, some larger installations may wish to tune the merge policy settings: - You can also adjust `index.merge.policy.reclaim_deletes_weight`, which controls how aggressively deletions are targeted. But this can lead to costly merge decisions, so we recommend not changing this unless you understand the tradeoffs. ```bash - curl --request PUT http://localhost:9200/gitlab-production/_settings --data '{ + curl --request PUT localhost:9200/gitlab-production/_settings ---header 'Content-Type: application/json' --data '{ "index" : { "merge.policy.reclaim_deletes_weight": "3.0" } diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb index f96206f1747..b067a44e325 100644 --- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb +++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true module QA - context 'Performance bar' do + # https://gitlab.com/gitlab-org/gitlab/issues/38315 + context 'Performance bar', :quarantine do context 'when logged in as an admin user', :requires_admin do before do Flow::Login.sign_in_as_admin |