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

Adding mode of operations - either single-instance or clustered-instance #29458

Merged
merged 1 commit into from
Nov 7, 2017

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Nov 6, 2017

Description

Adds config switch let owncloud know if the instance is part of a cluster or not.
Instead of adding yet another boolean flag we will use two different values for the mode of operations.
This allows us to extend the operation modes in the future if necessary.

Related Issue

fixes #29444

How Has This Been Tested?

  • market app UI
  • market occ commands

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@DeepDiver1975 DeepDiver1975 added this to the development milestone Nov 6, 2017
@DeepDiver1975 DeepDiver1975 self-assigned this Nov 6, 2017
@DeepDiver1975
Copy link
Member Author

market app already handles this properly - see https://github.com/owncloud/market/blob/c752a76f450cd3ab71718defaea71631a6d6e675/lib/MarketService.php#L89

We might want to change the error message ....

@DeepDiver1975
Copy link
Member Author

market app related changes discussed in here - owncloud/market#184 (comment)

@PVince81
Copy link
Contributor

PVince81 commented Nov 6, 2017

@DeepDiver1975 are you suggesting that we leave the market app enabled even in clustered mode ? If we do, best UX would be to disable the "Install" button in the web UI with a message there.

I think for now easier is likely to have the app auto-disable itself in app.php if it detects clustered mode ?

@DeepDiver1975
Copy link
Member Author

DeepDiver1975 commented Nov 6, 2017

are you suggesting that we leave the market app enabled even in clustered mode ? If we do, best UX would be to disable the "Install" button in the web UI with a message there.

absolutly - owncloud/market#184 (comment)

@PVince81
Copy link
Contributor

PVince81 commented Nov 6, 2017

@DeepDiver1975 ok, sounds good then. Let's make sure that at least the error message is based on the switch, telling the admin that apps need to be installed manually.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@codecov
Copy link

codecov bot commented Nov 6, 2017

Codecov Report

Merging #29458 into master will increase coverage by <.01%.
The diff coverage is 75%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #29458      +/-   ##
============================================
+ Coverage     60.84%   60.85%   +<.01%     
- Complexity    17238    17240       +2     
============================================
  Files          1032     1032              
  Lines         57365    57372       +7     
============================================
+ Hits          34904    34912       +8     
+ Misses        22461    22460       -1
Impacted Files Coverage Δ Complexity Δ
config/config.sample.php 0% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/App/AppManager.php 84.31% <100%> (+2.31%) 54 <0> (+1) ⬆️
lib/private/Server.php 82.24% <100%> (+0.02%) 118 <0> (ø) ⬇️
lib/private/Config.php 88.04% <50%> (-0.85%) 38 <0> (+1)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cef2009...8f7c832. Read the comment docs.

@PVince81
Copy link
Contributor

PVince81 commented Nov 6, 2017

codecov not happy on the two lines that read config

@phil-davis
Copy link
Contributor

Backport stable10 #29492

@lock
Copy link

lock bot commented Aug 2, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cluster mode config.php switch
4 participants