Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 10ef9a8

Browse files
authored
Merge branch 'master' into db_mftf_testlist
2 parents 34dbac6 + b7feef9 commit 10ef9a8

40 files changed

+4419
-3266
lines changed

_data/toc/cloud-guide.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@ pages:
208208
children:
209209
- label: Application
210210
url: /cloud/project/project-conf-files_magento-app.html
211+
children:
212+
- label: Set cache for static files
213+
url: /cloud/project/set-cache.html
211214

212215
- label: Build and deploy
213216
url: /cloud/project/magento-env-yaml.html
@@ -307,6 +310,9 @@ pages:
307310
- label: Manage branches with the CLI
308311
url: /cloud/env/environments-start.html
309312

313+
- label: Profile database queries
314+
url: /cloud/project/profile-database-queries.html
315+
310316
- label: Snapshots and backup management
311317
url: /cloud/project/project-webint-snap.html
312318

_data/whats-new.yml

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,55 @@ description: |
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: /whats-new.html
66
thread: /whatsnew-feed.xml
7-
updated: Fri Jul 26 15:50:11 2019
7+
updated: Fri Aug 2 12:05:50 2019
88
entries:
9-
- description: Updated changes in the 2.3.2 schema of the [customer endpoint](https://devdocs.magento.com/guides/v2.3/graphql/reference/customer.htm).
9+
- description: Added information about patch PRODSECBUG-2233 to the relevant release
10+
notes for affected Magento versions.
11+
versions: 2.2.8, 2.2.x, 2.3.0, 2.3.1, 2.3.x, 2.x
12+
type: Major update
13+
date: August 2, 2019
14+
link: https://github.com/magento/devdocs/pull/5091
15+
- description: Added the 'Backward Compatibility' section to the [Magento Definition
16+
of Done](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing_dod.html).
17+
versions: 2.3.x
18+
type: Major update
19+
date: July 31, 2019
20+
link: https://github.com/magento/devdocs/pull/4801
21+
- description: "Updated the [Services topic](https://devdocs.magento.com/guides/v2.2/cloud/project/project-conf-files_services.html)
22+
in the Cloud guide.<br/>- Clarified the disk value requirements.<br/>- Simplified the
23+
[relationships property](https://devdocs.magento.com/guides/v2.2/cloud/project/project-conf-files_magento-app.html#relationships)
24+
in the application configuration."
25+
versions: 2.x
26+
type: Technical changes
27+
date: July 30, 2019
28+
link: https://github.com/magento/devdocs/pull/5039
29+
- description: Added the new topic [CSS Critical Path](https://devdocs.magento.com/guides/v2.2/frontend-dev-guide/css-topics/css-critical-path.html)
30+
to the Frontend Developer Guide.
31+
versions: 2.2.x, 2.3.x
32+
type: New topic
33+
date: July 30, 2019
34+
link: https://github.com/magento/devdocs/pull/4726
35+
- description: Added steps for [creating a patch from a git commit](https://devdocs.magento.com/guides/v2.2/comp-mgr/patching.html#custom-patches).
36+
versions: 2.2.x, 2.3.x
37+
type: Major update
38+
date: July 29, 2019
39+
link: https://github.com/magento/devdocs/pull/5056
40+
- description: Added a new section about [changing the Blackfire account owner](https://devdocs.magento.com/guides/v2.3/cloud/project/project-integrate-blackfire.html#change-account-owner)
41+
on a Magento Commerce (Cloud) project.
42+
versions: 2.2.x, 2.3.x
43+
type: Major update
44+
date: July 29, 2019
45+
link: https://github.com/magento/devdocs/pull/5070
46+
- description: Updated the [Fastly Set up](https://devdocs.magento.com/guides/v2.3/cloud/cdn/configure-fastly.html)
47+
instructions to remove the requirement to install the Fastly CDN module for Magento
48+
2 in Magento Commerce Cloud environments. The latest version of the Fastly module
49+
is installed by default in Pro Staging and Production environments, and in the
50+
Starter Production (`master`) environment.
51+
versions: 2.2.x
52+
type: Major update
53+
date: July 27, 2019
54+
link: https://github.com/magento/devdocs/pull/5025
55+
- description: Updated changes in the 2.3.2 schema of the [customer endpoint](https://devdocs.magento.com/guides/v2.3/graphql/reference/customer.html).
1056
versions: 2.3.x
1157
type: Major update
1258
date: July 25, 2019
@@ -18,7 +64,7 @@ entries:
1864
type: Technical changes
1965
date: July 25, 2019
2066
link: https://github.com/magento/devdocs/pull/5023
21-
- description: Added the [Asynchronous and deferred operations](http://devdocs.magento.com/guides/v2.3/extension-dev-guide/async-operations.md)
67+
- description: Added the [Asynchronous and deferred operations](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/async-operations.html)
2268
topic to the PHP Developer Guide.
2369
versions: 2.3.x
2470
type: Major update

_includes/contributor/labels.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ General labels include a variety of tasks and definitions for pull requests and
7878
* `help wanted` - Indicates the creator or author needs help with a decision, advice for resolving, and so on.
7979
* `triage wanted` - Indicates the issues are under triage. See this information to learn more about the [Triage Wanted program](https://github.com/magento/magento2/wiki/Triage-Wanted).
8080

81-
### Issue Resolution Status
81+
### Issue resolution status
8282
{:.no_toc}
8383

8484
Labels applied to issues through verification and completion. For details on the process, see [GitHub Issues Processing Workflow](https://github.com/magento/magento2/wiki/GitHub-Issues-Processing-Workflow).
@@ -101,7 +101,7 @@ Labels applied to issues through verification and completion. For details on the
101101

102102
All [contributions to DevDocs](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md) receive the following labels:
103103

104-
* `New topic`- New file submissions for content that has never existed on devdocs
105-
* `Major update` - Significant updates to existing content, such as a new section or example
106-
* `Technical` - Updates to the code or processes that alter the technical content of the document
107-
* `Editorial` - Fixes for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies.
104+
* `New topic`- New topic submissions for content that has never existed on DevDocs such as tutorials, references, instructions, and so on
105+
* `Major update` - Significant original updates to existing content
106+
* `Technical` - Updates to the code or processes that alter the technical content of the document, such as code snippets, reference documentation, parameter names and values, and other relevant content
107+
* `Editorial` - Fixes for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies

_includes/contributor/rewards.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ Each PR can earn one of the following additional achievements. If you entered an
7676

7777
Achievement | Points | Description
7878
| ------------ | --- | --- |
79-
New topic | 30 | New file submissions for content that has never existed on devdocs
80-
Major update | 20 | Significant updates to existing content, such as a new section or example
81-
Technical | 10 | Updates to code or processes that alter the technical content of the document
79+
New topic | 30 | New topic submissions for content that has never existed in DevDocs, such as tutorials, references, instructions, and other relevant content
80+
Major update | 20 | Significant updates to existing content
81+
Technical | 10 | Updates to code or processes that alter the technical content of the document, such as code snippets, reference documentation, parameter names and values, and other relevant content
8282

83+
If the PR earns recognition for significant updates and additions to the documentation, it may also receive a Special Achievement label, which garners an additional 20 points.

_includes/layout/header-scripts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{
2828
label: "PWA",
2929
name: "pwa-devdocs",
30-
baseUrl: "https://magento-research.github.io/pwa-studio"
30+
baseUrl: "https://magento.github.io/pwa-studio"
3131
},
3232
{
3333
label: "Order Management",

guides/v2.2/cloud/architecture/cloud-architecture.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ group: cloud-guide
33
title: Magento Commerce Cloud architecture
44
functional_areas:
55
- Cloud
6+
redirect_from:
7+
- /guides/v2.2/cloud/basic-information/cloud-plans.html
68
---
79

810
{{site.data.var.ece}} has a Starter and a Pro plan. Each plan has a unique architecture to drive your {{site.data.var.ee}} development and deployment process. Both the Starter plan and the Pro plan architecture deploy databases, web server, and caching servers across multiple environments for end-to-end testing while supporting continuous integration.

guides/v2.2/cloud/cdn/configure-fastly.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ Fastly caching services do not work until you complete the initial upload of the
126126
{: .bs-callout-info}
127127
Before adding [custom](#custom-configuration) or advanced configuration settings like [updating purge settings](#purge) and configuring [Fastly image optimization]({{ page.baseurl }}/cloud/cdn/fastly-image-optimization.html)(Fastly IO), [verify]({{ page.baseurl }}/cloud/cdn/trouble-fastly.html) that the Fastly caching service works with the default configuration.
128128

129-
Configure the following features and enable additional [configuration options](https://github.com/fastly/fastly-magento2/blob/master/Documentation/CONFIGURATION.md#further-configuration-options) as needed:
129+
Configure the following features as needed:
130130

131-
* [Upload Fastly VCL snippets](#upload-vcl-snippets)
132131
* [Configure backends and Origin shielding](#backend)
133132
* [Customize response pages]({{ page.baseurl }}/cloud/cdn/cloud-fastly-custom-response.html)
133+
* [Enable additional Fastly configuration options](https://github.com/fastly/fastly-magento2/blob/master/Documentation/CONFIGURATION.md#further-configuration-options)
134134

135135
### Configure backends and Origin shielding {#backend}
136136

guides/v2.2/cloud/docker/docker-config.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ For example, the following command starts the Docker configuration generator for
7777
```bash
7878
echo "127.0.0.1 magento2.docker" | sudo tee -a /etc/hosts
7979
```
80+
81+
{: .bs-callout-tip }
82+
To change the `magento2.docker` hostname for your project, you must update the host in three files: `.docker/config.php`, `docker-compose.yml`, and `/etc/hosts`
8083
8184
1. Stop the default Apache instance on Mac OS.
8285
@@ -204,7 +207,7 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
204207
205208
1. _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [enable and configure Xdebug]({{ page.baseurl }}/cloud/docker/docker-development-debug.html).
206209
207-
1. Start the file synchronization.
210+
1. Start the file synchronization (use one of the following).
208211
209212
For the `docker-sync` tool:
210213
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
---
2+
group: cloud-guide
3+
title: Profile database queries
4+
functional_areas:
5+
- Cloud
6+
- Setup
7+
- Services
8+
---
9+
10+
When making changes to a database, you may find it helpful to run profiling to identify the impact of those changes. Profiling maintains a log of database queries and increases run-time precision.
11+
12+
#### To enable database query profiling:
13+
14+
1. [Log in to the database]({{page.baseurl}}/cloud/env/environments-start.html#commands).
15+
16+
1. Enable profiling.
17+
18+
```sql
19+
SET @@profiling = 1;
20+
... run some queries
21+
```
22+
23+
1. Display the log of queries.
24+
25+
```sql
26+
SHOW profiles
27+
```
28+
29+
1. Clear the profile queue.
30+
31+
```sql
32+
SET @@profiling = 0;
33+
SET @@profiling_history_size = 0;
34+
SET @@profiling_history_size = 100;
35+
SET @@profiling = 1;
36+
```
37+
38+
#### Example log
39+
40+
{: .no-copy}
41+
```sql
42+
MariaDB [6fck2obu3244c]> show profiles;
43+
+----------+------------+---------------------------------------------------------------------------------------------------------------------------------+
44+
| Query_ID | Duration | Query |
45+
+----------+------------+---------------------------------------------------------------------------------------------------------------------------------+
46+
| 2 | 0.00375905 | ALTER TABLE mcom_logged_messages_queue DROP INDEX status |
47+
| 3 | 1.13660446 | CREATE INDEX `idx_status_direction` ON mcom_logged_messages_queue (status, direction) |
48+
| 4 | 0.00270735 | SELECT count(*) FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
49+
| 5 | 0.00376312 | ALTER TABLE mcom_logged_messages_queue DROP INDEX status |
50+
| 6 | 0.00585975 | ALTER TABLE mcom_logged_messages_queue DROP INDEX idx_status_direction |
51+
| 7 | 1.16887269 | CREATE INDEX `idx_status` ON mcom_logged_messages_queue (status) |
52+
| 8 | 0.00299303 | SELECT count(*) FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
53+
| 9 | 0.00379892 | ALTER TABLE mcom_logged_messages_queue DROP INDEX status |
54+
| 10 | 0.00737345 | ALTER TABLE mcom_logged_messages_queue DROP INDEX idx_status |
55+
| 11 | 1.05551113 | CREATE INDEX `idx_direction` ON mcom_logged_messages_queue (direction) |
56+
| 12 | 1.02493811 | SELECT count(*) FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
57+
| 13 | 0.00368751 | ALTER TABLE mcom_logged_messages_queue DROP INDEX status |
58+
| 14 | 0.00706102 | ALTER TABLE mcom_logged_messages_queue DROP INDEX idx_direction |
59+
| 15 | 0.29753293 | SELECT count(*) FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
60+
| 16 | 1.24034449 | CREATE INDEX `idx_direction` ON mcom_logged_messages_queue (direction) |
61+
| 17 | 0.74422050 | SELECT count(*) FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
62+
| 18 | 1.16976630 | CREATE INDEX `idx_status` ON mcom_logged_messages_queue (status) |
63+
| 19 | 0.00293179 | SELECT count(*) FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
64+
| 20 | 0.02663829 | SELECT * FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
65+
| 21 | 0.00736756 | ALTER TABLE mcom_logged_messages_queue DROP INDEX idx_direction |
66+
| 22 | 0.00406736 | ALTER TABLE mcom_logged_messages_queue DROP INDEX status |
67+
| 23 | 0.00815528 | ALTER TABLE mcom_logged_messages_queue DROP INDEX idx_status |
68+
| 24 | 0.37585821 | SELECT * FROM `mcom_logged_messages_queue` WHERE (status = 'FAILED') AND (direction = 'outgoing') ORDER BY `sent_at` ASC |
69+
+----------+------------+---------------------------------------------------------------------------------------------------------------------------------+
70+
```

guides/v2.2/cloud/project/project-conf-files_services-elastic.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,18 @@ functional_areas:
4343

4444
1. [Verify the relationships]({{page.baseurl}}/cloud/project/project-conf-files_services.html#service-relationships) and configure Elasticsearch in the Admin UI.
4545

46+
1. Reindex the Catalog Search index.
47+
48+
```bash
49+
bin/magento indexer:reindex catalogsearch_fulltext
50+
```
51+
52+
1. Clean the cache.
53+
54+
```bash
55+
bin/magento cache:clean
56+
```
57+
4658
### Add Elasticsearch plugins
4759

4860
Optionally, you can add plugins with the `.magento/services.yaml` file. For example, to enable the ICU analysis plugin and Python script support plugin, add the `configuration:plugins` section with the listed plugin codes:

0 commit comments

Comments
 (0)