summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-04-16 21:18:09 +0300
committerLauri Ojansivu <x@xet7.org>2018-04-16 21:18:09 +0300
commite26a4824cfb119a15767c4827190a6b9ab65b904 (patch)
tree201b388b93bda3ae29728861993bbf01ab879acc
parentc12e003fd3ecc50bee64931bc19febee1b99c103 (diff)
downloadwekan-e26a4824cfb119a15767c4827190a6b9ab65b904.tar.gz
wekan-e26a4824cfb119a15767c4827190a6b9ab65b904.tar.bz2
wekan-e26a4824cfb119a15767c4827190a6b9ab65b904.zip
Fix Node Fibers 100% CPU issue.
Thanks to kentonv ! Related wekan/wekan-mongodb#2, related meteor/meteor#9796
-rw-r--r--Dockerfile25
-rw-r--r--server/authentication.js7
-rw-r--r--snapcraft.yaml20
3 files changed, 50 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index cb323ab0..38a81cef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG SRC_PATH
# Set the environment variables (defaults where required)
# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7 paxctl"
-ENV NODE_VERSION ${NODE_VERSION:-v8.9.3}
+ENV NODE_VERSION ${NODE_VERSION:-v8.11.1}
ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1}
ENV USE_EDGE ${USE_EDGE:-false}
ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
@@ -68,6 +68,29 @@ RUN \
tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \
+ \
+ # Remove original node, use Fibers 100% CPU usage issue patched node
+ rm /opt/nodejs/bin/node && \
+ # Node Fibers 100% CPU usage issue:
+ # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+ # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+ # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+ # Also see beginning of wekan/server/authentication.js
+ # import Fiber from "fibers";
+ # Fiber.poolSize = 1e9;
+ # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+ # Description at https://releases.wekan.team/node.txt
+ # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
+ echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d node" >> node-SHASUMS256.txt.asc && \
+ wget https://releases.wekan.team/node && \
+ # Verify Fibers patched node authenticity
+ echo "Fibers patched node authenticity:" && \
+ grep node node-SHASUMS256.txt.asc | shasum -a 256 -c - && \
+ rm -f node-SHASUMS256.txt.asc && \
+ chmod +x node && \
+ mv node /opt/nodejs/bin/ && \
+ \
+ # Create symlinks
ln -s /opt/nodejs/bin/node /usr/bin/node && \
ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
\
diff --git a/server/authentication.js b/server/authentication.js
index acc101cc..efe95015 100644
--- a/server/authentication.js
+++ b/server/authentication.js
@@ -1,5 +1,12 @@
Meteor.startup(() => {
+ // Node Fibers 100% CPU usage issue
+ // https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+ // https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+ // https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+ import Fiber from "fibers";
+ Fiber.poolSize = 1e9;
+
Accounts.validateLoginAttempt(function (options) {
const user = options.user || {};
return !user.loginDisabled;
diff --git a/snapcraft.yaml b/snapcraft.yaml
index fd123b21..abcd1cc6 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -81,7 +81,7 @@ parts:
wekan:
source: .
plugin: nodejs
- node-engine: 8.9.3
+ node-engine: 8.11.1
node-packages:
- npm@5.5.1
- node-gyp
@@ -100,6 +100,24 @@ parts:
prepare: |
echo "Cleaning environment first"
rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
+ # Node Fibers 100% CPU usage issue:
+ # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+ # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+ # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+ # Also see beginning of wekan/server/authentication.js
+ # import Fiber from "fibers";
+ # Fiber.poolSize = 1e9;
+ # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+ # Description at https://releases.wekan.team/node.txt
+ # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
+ echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d node" >> node-SHASUMS256.txt.asc
+ wget https://releases.wekan.team/node
+ # Verify Fibers patched node authenticity
+ echo "Fibers 100% CPU issue patched node authenticity:"
+ grep node node-SHASUMS256.txt.asc | shasum -a 256 -c -
+ rm -f node-SHASUMS256.txt.asc
+ chmod +x node
+ mv node `which node`
echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
paxctl -mC `which node`
echo "Installing meteor"