Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Bugfix: Expiring a partially completed tree (#17926)" #17941

Merged
merged 1 commit into from
Jan 30, 2020

Conversation

acdlite
Copy link
Collaborator

@acdlite acdlite commented Jan 30, 2020

#17926 caused a regression in Facebook. Don't know the reason yet but reverting to unblock master.

This reverts commit 01974a8.

* Failing test: Expiring a partially completed tree

We should not throw out a partially completed tree if it expires in the
middle of rendering. We should finish the rest of the tree without
yielding, then finish any remaining expired levels in a single batch.

* Check if there's a partial tree before restarting

If a partial render expires, we should stay in the concurrent path
(performConcurrentWorkOnRoot); we'll stop yielding, but the rest of the
behavior remains the same.

We will only revert to the sync path (performSyncWorkOnRoot) when
starting on a new level.

This approach prevents partially completed concurrent work from
being discarded.

* New test: retry after error during expired render
@facebook-github-bot facebook-github-bot added CLA Signed React Core Team Opened by a member of the React Core Team labels Jan 30, 2020
@codesandbox-ci
Copy link

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit b998e7e:

Sandbox Source
brave-faraday-dsmpw Configuration

@sizebot
Copy link

sizebot commented Jan 30, 2020

Details of bundled changes.

Comparing: d2ae77d...b998e7e

react-test-renderer

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-test-renderer.development.js -0.1% -0.1% 623.44 KB 622.98 KB 131.64 KB 131.5 KB UMD_DEV
react-test-renderer.production.min.js -0.0% -0.2% 71.94 KB 71.93 KB 21.97 KB 21.94 KB UMD_PROD
react-test-renderer-shallow.development.js 0.0% 0.0% 37.89 KB 37.89 KB 9.84 KB 9.84 KB UMD_DEV
react-test-renderer-shallow.production.min.js 0.0% 🔺+0.1% 11.66 KB 11.66 KB 3.6 KB 3.6 KB UMD_PROD
react-test-renderer-shallow.development.js 0.0% 0.0% 32.43 KB 32.43 KB 8.53 KB 8.53 KB NODE_DEV
react-test-renderer-shallow.production.min.js 0.0% 0.0% 11.79 KB 11.79 KB 3.71 KB 3.71 KB NODE_PROD
react-test-renderer.development.js -0.1% -0.1% 618.7 KB 618.24 KB 130.46 KB 130.32 KB NODE_DEV
react-test-renderer.production.min.js -0.0% -0.0% 71.64 KB 71.63 KB 21.56 KB 21.56 KB NODE_PROD
ReactTestRenderer-dev.js -0.1% -0.1% 634.53 KB 634.07 KB 131.28 KB 131.14 KB FB_WWW_DEV

react-native-renderer

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
ReactNativeRenderer-dev.js -0.1% -0.1% 751.47 KB 751.01 KB 158.07 KB 157.93 KB RN_OSS_DEV
ReactFabric-dev.js -0.1% -0.1% 742.09 KB 741.63 KB 155.86 KB 155.73 KB RN_OSS_DEV
ReactNativeRenderer-dev.js -0.1% -0.1% 751.65 KB 751.19 KB 158.17 KB 158.03 KB RN_FB_DEV
ReactFabric-prod.js -0.0% -0.0% 266.84 KB 266.81 KB 45.78 KB 45.77 KB RN_OSS_PROD
ReactNativeRenderer-prod.js -0.0% -0.0% 274.8 KB 274.78 KB 47.11 KB 47.1 KB RN_FB_PROD
ReactFabric-profiling.js -0.0% -0.0% 278 KB 277.97 KB 47.91 KB 47.9 KB RN_OSS_PROFILING
ReactNativeRenderer-profiling.js -0.0% -0.0% 286 KB 285.98 KB 49.25 KB 49.25 KB RN_FB_PROFILING
ReactNativeRenderer-prod.js -0.0% -0.0% 274.41 KB 274.39 KB 47.04 KB 47.03 KB RN_OSS_PROD
ReactFabric-dev.js -0.1% -0.1% 742.27 KB 741.81 KB 155.95 KB 155.81 KB RN_FB_DEV
ReactNativeRenderer-profiling.js -0.0% -0.0% 285.62 KB 285.59 KB 49.18 KB 49.18 KB RN_OSS_PROFILING
ReactFabric-prod.js -0.0% -0.0% 267.19 KB 267.16 KB 45.85 KB 45.84 KB RN_FB_PROD
ReactFabric-profiling.js -0.0% -0.0% 278.34 KB 278.31 KB 47.97 KB 47.97 KB RN_FB_PROFILING

react-art

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
ReactART-dev.js -0.1% -0.1% 622.85 KB 622.39 KB 128.73 KB 128.58 KB FB_WWW_DEV
ReactART-prod.js -0.0% -0.0% 236.32 KB 236.29 KB 39.8 KB 39.8 KB FB_WWW_PROD
react-art.development.js -0.1% -0.1% 678.73 KB 678.27 KB 146.12 KB 145.99 KB UMD_DEV
react-art.production.min.js -0.0% 0.0% 107.33 KB 107.32 KB 32.52 KB 32.52 KB UMD_PROD
react-art.development.js -0.1% -0.1% 609.41 KB 608.95 KB 128.7 KB 128.57 KB NODE_DEV
react-art.production.min.js -0.0% -0.0% 72.29 KB 72.29 KB 21.69 KB 21.68 KB NODE_PROD

react-dom

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-dom.profiling.min.js -0.0% -0.0% 123.82 KB 123.81 KB 38.8 KB 38.8 KB NODE_PROFILING
react-dom-server.browser.development.js 0.0% 0.0% 138.97 KB 138.97 KB 36.81 KB 36.81 KB UMD_DEV
react-dom-test-utils.development.js 0.0% 0.0% 54.86 KB 54.86 KB 15.43 KB 15.43 KB UMD_DEV
ReactDOMServer-prod.js 0.0% 0.0% 49 KB 49 KB 11.19 KB 11.19 KB FB_WWW_PROD
react-dom-unstable-fizz.browser.development.js 0.0% +0.1% 3.88 KB 3.88 KB 1.55 KB 1.55 KB UMD_DEV
react-dom-test-utils.production.min.js 0.0% 0.0% 11.18 KB 11.18 KB 4.15 KB 4.15 KB UMD_PROD
react-dom-unstable-fizz.browser.production.min.js 0.0% 🔺+0.1% 1.21 KB 1.21 KB 709 B 710 B UMD_PROD
react-dom-test-utils.development.js 0.0% 0.0% 53.13 KB 53.13 KB 15.11 KB 15.11 KB NODE_DEV
react-dom-unstable-fizz.browser.development.js 0.0% +0.1% 3.71 KB 3.71 KB 1.5 KB 1.5 KB NODE_DEV
react-dom-test-utils.production.min.js 0.0% 0.0% 10.95 KB 10.95 KB 4.09 KB 4.09 KB NODE_PROD
react-dom-unstable-fizz.browser.production.min.js 0.0% 🔺+0.2% 1.05 KB 1.05 KB 640 B 641 B NODE_PROD
react-dom.development.js -0.0% -0.1% 961.26 KB 960.8 KB 215.87 KB 215.74 KB UMD_DEV
react-dom.production.min.js -0.0% -0.0% 119.86 KB 119.85 KB 38.42 KB 38.42 KB UMD_PROD
react-dom.profiling.min.js -0.0% -0.0% 123.59 KB 123.58 KB 39.61 KB 39.61 KB UMD_PROFILING
react-dom.development.js -0.0% -0.1% 955.32 KB 954.86 KB 214.19 KB 214.06 KB NODE_DEV
react-dom-server.node.development.js 0.0% 0.0% 136.01 KB 136.01 KB 36.02 KB 36.02 KB NODE_DEV
react-dom.production.min.js -0.0% -0.0% 119.94 KB 119.93 KB 37.68 KB 37.67 KB NODE_PROD
react-dom-server.node.production.min.js 0.0% 0.0% 20.8 KB 20.8 KB 7.63 KB 7.63 KB NODE_PROD
react-dom-server.browser.development.js 0.0% 0.0% 134.9 KB 134.9 KB 35.78 KB 35.79 KB NODE_DEV
ReactDOM-dev.js -0.0% -0.1% 983.05 KB 982.59 KB 217.05 KB 216.92 KB FB_WWW_DEV
react-dom-server.browser.production.min.js 0.0% 0.0% 20.39 KB 20.39 KB 7.47 KB 7.47 KB NODE_PROD
ReactDOM-prod.js -0.0% -0.0% 393.45 KB 393.42 KB 71.89 KB 71.88 KB FB_WWW_PROD
react-dom-unstable-native-dependencies.development.js 0.0% 0.0% 60.91 KB 60.91 KB 16.07 KB 16.07 KB UMD_DEV
ReactDOM-profiling.js -0.0% -0.0% 404.77 KB 404.74 KB 74.05 KB 74.05 KB FB_WWW_PROFILING
react-dom-unstable-fizz.node.development.js 0.0% +0.1% 4.42 KB 4.42 KB 1.65 KB 1.65 KB NODE_DEV
react-dom-unstable-native-dependencies.production.min.js 0.0% 0.0% 9.97 KB 9.97 KB 3.37 KB 3.37 KB NODE_PROD
ReactDOMServer-dev.js 0.0% 0.0% 140.24 KB 140.24 KB 35.49 KB 35.49 KB FB_WWW_DEV

react-reconciler

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-reconciler-persistent.development.js -0.1% -0.1% 607.54 KB 607.08 KB 126.66 KB 126.53 KB NODE_DEV
react-reconciler-reflection.development.js 0.0% 0.0% 19.59 KB 19.59 KB 6.42 KB 6.42 KB NODE_DEV
react-reconciler-persistent.production.min.js -0.0% -0.0% 72.54 KB 72.53 KB 21.33 KB 21.32 KB NODE_PROD
react-reconciler-reflection.production.min.js 0.0% 🔺+0.1% 2.86 KB 2.86 KB 1.24 KB 1.24 KB NODE_PROD
react-reconciler.development.js -0.1% -0.1% 610.41 KB 609.95 KB 127.87 KB 127.74 KB NODE_DEV
react-reconciler.production.min.js -0.0% -0.0% 75.3 KB 75.29 KB 21.96 KB 21.96 KB NODE_PROD

Size changes (experimental)

Generated by 🚫 dangerJS against b998e7e

@sizebot
Copy link

sizebot commented Jan 30, 2020

Details of bundled changes.

Comparing: d2ae77d...b998e7e

react-native-renderer

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
ReactFabric-dev.js -0.1% -0.1% 742.08 KB 741.62 KB 155.86 KB 155.72 KB RN_OSS_DEV
ReactFabric-prod.js -0.0% -0.0% 266.82 KB 266.8 KB 45.77 KB 45.76 KB RN_OSS_PROD
ReactNativeRenderer-dev.js -0.1% -0.1% 751.46 KB 751 KB 158.07 KB 157.93 KB RN_OSS_DEV
ReactFabric-profiling.js -0.0% -0.0% 277.98 KB 277.96 KB 47.9 KB 47.89 KB RN_OSS_PROFILING
ReactNativeRenderer-prod.js -0.0% -0.0% 274.4 KB 274.37 KB 47.03 KB 47.02 KB RN_OSS_PROD
ReactNativeRenderer-profiling.js -0.0% -0.0% 285.61 KB 285.58 KB 49.18 KB 49.17 KB RN_OSS_PROFILING

react-reconciler

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-reconciler-persistent.production.min.js -0.0% -0.0% 72.53 KB 72.52 KB 21.32 KB 21.31 KB NODE_PROD
react-reconciler.development.js -0.1% -0.1% 610.4 KB 609.94 KB 127.87 KB 127.74 KB NODE_DEV
react-reconciler.production.min.js -0.0% -0.0% 72.52 KB 72.51 KB 21.31 KB 21.31 KB NODE_PROD
react-reconciler-reflection.development.js 0.0% 0.0% 19.58 KB 19.58 KB 6.42 KB 6.42 KB NODE_DEV
react-reconciler-reflection.production.min.js 0.0% 🔺+0.1% 2.85 KB 2.85 KB 1.23 KB 1.24 KB NODE_PROD
react-reconciler-persistent.development.js -0.1% -0.1% 607.53 KB 607.06 KB 126.66 KB 126.53 KB NODE_DEV

react-dom

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-dom-server.browser.production.min.js 0.0% 0.0% 19.94 KB 19.94 KB 7.39 KB 7.4 KB NODE_PROD
react-dom-test-utils.development.js 0.0% 0.0% 53.12 KB 53.12 KB 15.1 KB 15.1 KB NODE_DEV
react-dom.production.min.js -0.0% 0.0% 115.96 KB 115.95 KB 37.29 KB 37.3 KB UMD_PROD
react-dom-unstable-native-dependencies.development.js 0.0% 0.0% 60.59 KB 60.59 KB 15.99 KB 15.99 KB NODE_DEV
react-dom.profiling.min.js -0.0% 0.0% 119.58 KB 119.57 KB 38.45 KB 38.46 KB UMD_PROFILING
react-dom-unstable-native-dependencies.production.min.js 0.0% 0.0% 9.96 KB 9.96 KB 3.36 KB 3.36 KB NODE_PROD
react-dom.development.js -0.0% -0.1% 955.3 KB 954.84 KB 214.17 KB 214.04 KB NODE_DEV
react-dom.production.min.js -0.0% -0.0% 116.02 KB 116.01 KB 36.64 KB 36.63 KB NODE_PROD
react-dom.profiling.min.js -0.0% -0.0% 119.78 KB 119.77 KB 37.75 KB 37.75 KB NODE_PROFILING
react-dom-unstable-fizz.browser.development.js 0.0% +0.1% 3.87 KB 3.87 KB 1.54 KB 1.54 KB UMD_DEV
react-dom-unstable-fizz.browser.production.min.js 0.0% 🔺+0.1% 1.2 KB 1.2 KB 701 B 702 B UMD_PROD
react-dom-server.browser.development.js 0.0% 0.0% 138.95 KB 138.95 KB 36.81 KB 36.81 KB UMD_DEV
react-dom-server.browser.production.min.js 0.0% 0.0% 20.01 KB 20.01 KB 7.41 KB 7.41 KB UMD_PROD
react-dom-unstable-fizz.browser.development.js 0.0% +0.1% 3.7 KB 3.7 KB 1.49 KB 1.49 KB NODE_DEV
react-dom-test-utils.development.js 0.0% 0.0% 54.84 KB 54.84 KB 15.42 KB 15.42 KB UMD_DEV
react-dom-unstable-fizz.browser.production.min.js 0.0% 🔺+0.2% 1.04 KB 1.04 KB 633 B 634 B NODE_PROD
react-dom-test-utils.production.min.js 0.0% 0.0% 11.17 KB 11.17 KB 4.14 KB 4.14 KB UMD_PROD
react-dom-server.browser.development.js 0.0% 0.0% 134.88 KB 134.88 KB 35.78 KB 35.78 KB NODE_DEV
react-dom-test-utils.production.min.js 0.0% 0.0% 10.94 KB 10.94 KB 4.08 KB 4.08 KB NODE_PROD
react-dom-unstable-fizz.node.development.js 0.0% +0.1% 4.4 KB 4.4 KB 1.64 KB 1.64 KB NODE_DEV
react-dom-unstable-native-dependencies.development.js 0.0% 0.0% 60.89 KB 60.89 KB 16.06 KB 16.06 KB UMD_DEV
react-dom-unstable-fizz.node.production.min.js 0.0% -0.1% 1.2 KB 1.2 KB 689 B 688 B NODE_PROD
react-dom-unstable-native-dependencies.production.min.js 0.0% 0.0% 10.22 KB 10.22 KB 3.46 KB 3.47 KB UMD_PROD
react-dom-server.node.development.js 0.0% 0.0% 135.99 KB 135.99 KB 36.01 KB 36.01 KB NODE_DEV
react-dom.development.js -0.0% -0.1% 961.24 KB 960.78 KB 215.85 KB 215.72 KB UMD_DEV
react-dom-server.node.production.min.js 0.0% 0.0% 20.34 KB 20.34 KB 7.55 KB 7.55 KB NODE_PROD

react-art

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-art.production.min.js -0.0% -0.0% 104.78 KB 104.77 KB 31.84 KB 31.83 KB UMD_PROD
react-art.development.js -0.1% -0.1% 678.71 KB 678.24 KB 146.12 KB 145.99 KB UMD_DEV
react-art.development.js -0.1% -0.1% 609.38 KB 608.92 KB 128.69 KB 128.56 KB NODE_DEV
react-art.production.min.js -0.0% -0.0% 69.78 KB 69.77 KB 21.01 KB 21 KB NODE_PROD

react-test-renderer

File Filesize Diff Gzip Diff Prev Size Current Size Prev Gzip Current Gzip ENV
react-test-renderer-shallow.development.js 0.0% 0.0% 37.88 KB 37.88 KB 9.83 KB 9.83 KB UMD_DEV
react-test-renderer-shallow.production.min.js 0.0% 0.0% 11.64 KB 11.64 KB 3.59 KB 3.59 KB UMD_PROD
react-test-renderer-shallow.development.js 0.0% 0.0% 32.42 KB 32.42 KB 8.52 KB 8.52 KB NODE_DEV
react-test-renderer-shallow.production.min.js 0.0% -0.1% 11.78 KB 11.78 KB 3.7 KB 3.7 KB NODE_PROD
react-test-renderer.development.js -0.1% -0.1% 623.41 KB 622.95 KB 131.63 KB 131.49 KB UMD_DEV
react-test-renderer.production.min.js -0.0% -0.2% 71.92 KB 71.91 KB 21.96 KB 21.92 KB UMD_PROD
react-test-renderer.development.js -0.1% -0.1% 618.68 KB 618.22 KB 130.44 KB 130.31 KB NODE_DEV
react-test-renderer.production.min.js -0.0% -0.0% 71.62 KB 71.61 KB 21.55 KB 21.54 KB NODE_PROD

ReactDOM: size: -0.0%, gzip: 0.0%

Size changes (stable)

Generated by 🚫 dangerJS against b998e7e

@acdlite acdlite merged commit 9dbe1c5 into facebook:master Jan 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed React Core Team Opened by a member of the React Core Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants