Add latest changes from gitlab-org/gitlab@master

4 files changed, 61 insertions, 6 deletions

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 23b8458aa6b..463d1427805 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -163,9 +163,6 @@ export default {
     },
     isLoading: 'adjustView',
     showTreeList: 'adjustView',
-    retrievingBatches(newVal) {
-      if (!newVal) this.unwatchDiscussions();
-    },
   },
   mounted() {
     this.setBaseConfig({
@@ -198,6 +195,16 @@ export default {
       () => `${this.diffFiles.length}:${this.$store.state.notes.discussions.length}`,
       () => this.setDiscussions(),
     );
+
+    this.unwatchRetrievingBatches = this.$watch(
+      () => `${this.retrievingBatches}:${this.$store.state.notes.discussions.length}`,
+      () => {
+        if (!this.retrievingBatches && this.$store.state.notes.discussions.length) {
+          this.unwatchDiscussions();
+          this.unwatchRetrievingBatches();
+        }
+      },
+    );
   },
   beforeDestroy() {
     eventHub.$off('fetchDiffData', this.fetchData);
diff --git a/doc/administration/operations/puma.md b/doc/administration/operations/puma.md
new file mode 100644
index 00000000000..2490cf1f0ae
--- /dev/null
+++ b/doc/administration/operations/puma.md
@@ -0,0 +1,46 @@
+# Switching to Puma
+
+## Puma
+
+GitLab plans to use [Puma](https://github.com/puma/puma) to replace
+[Unicorn](https://bogomips.org/unicorn/).
+
+## Why switch to Puma?
+
+Puma has a multi-thread architecture which uses less memory than a multi-process
+application server like Unicorn.
+
+Most Rails applications requests normally include a proportion of I/O wait time.
+During I/O wait time MRI Ruby will release the GVL (Global VM Lock) to other threads.
+Multi-threaded Puma can therefore still serve more requests than a single process.
+
+## Performance caveat when using Puma with Rugged
+
+For deployments where NFS is used to store Git repository, we allow GitLab to use
+[Direct Git Access](../gitaly/#direct-git-access-in-gitlab-rails) to improve performance via usage of [Rugged](https://github.com/libgit2/rugged).
+
+Rugged usage is automatically enabled if Direct Git Access is present, unless it
+is disabled by [feature flags](../../development/gitaly.md#legacy-rugged-code).
+
+MRI Ruby uses a GVL. This allows MRI Ruby to be multi-threaded, but running at
+most on a single core. Since Rugged can use a thread for long periods of
+time (due to intensive I/O operations of Git access), this can starve other threads
+that might be processing requests. This is not a case for Unicorn or Puma running
+in a single thread mode, as concurrently at most one request is being processed.
+
+We are actively working on removing Rugged usage. Even though performance without Rugged
+is acceptable today, in some cases it might be still beneficial to run with it.
+
+Given the caveat of running Rugged with multi-threaded Puma, and acceptable
+performance of Gitaly, we are disabling Rugged usage if Puma multi-threaded is
+used (when Puma is configured to run with more than one thread).
+
+This default behavior may not be the optimal configuration in some situations. If Rugged
+plays an important role in your deployment, we suggest you benchmark to find the
+optimal configuration:
+
+- The safest option is to start with single-threaded Puma. When working with
+Rugged, single-threaded Puma does work the same as Unicorn.
+
+- To force Rugged auto detect with multi-threaded Puma, you can use [feature
+flags](../../development/gitaly.md#legacy-rugged-code).
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e3baf39f1f0..a7185b3c68f 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10959,9 +10959,6 @@ msgstr ""
 msgid "List"
 msgstr ""
 
-msgid "List Label"
-msgstr ""
-
 msgid "List Settings"
 msgstr ""
 
diff --git a/spec/javascripts/diffs/components/app_spec.js b/spec/javascripts/diffs/components/app_spec.js
index 2411fe8ad89..5f97182489e 100644
--- a/spec/javascripts/diffs/components/app_spec.js
+++ b/spec/javascripts/diffs/components/app_spec.js
@@ -77,6 +77,7 @@ describe('diffs/components/app', () => {
     beforeEach(done => {
       const fetchResolver = () => {
         store.state.diffs.retrievingBatches = false;
+        store.state.notes.discussions = 'test';
         return Promise.resolve({ real_size: 100 });
       };
       spyOn(window, 'requestIdleCallback').and.callFake(fn => fn());
@@ -87,6 +88,7 @@ describe('diffs/components/app', () => {
       spyOn(wrapper.vm, 'setDiscussions');
       spyOn(wrapper.vm, 'startRenderDiffsQueue');
       spyOn(wrapper.vm, 'unwatchDiscussions');
+      spyOn(wrapper.vm, 'unwatchRetrievingBatches');
       store.state.diffs.retrievingBatches = true;
       store.state.diffs.diffFiles = [];
       wrapper.vm.$nextTick(done);
@@ -240,6 +242,7 @@ describe('diffs/components/app', () => {
         expect(wrapper.vm.fetchDiffFilesBatch).not.toHaveBeenCalled();
         expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled();
         expect(wrapper.vm.diffFilesLength).toEqual(100);
+        expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled();
 
         done();
       });
@@ -258,6 +261,7 @@ describe('diffs/components/app', () => {
         expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled();
         expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled();
         expect(wrapper.vm.diffFilesLength).toEqual(100);
+        expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled();
         done();
       });
     });
@@ -274,6 +278,7 @@ describe('diffs/components/app', () => {
         expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled();
         expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled();
         expect(wrapper.vm.diffFilesLength).toEqual(100);
+        expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled();
         done();
       });
     });