Added ability to create replica 3 arbiter 1 gluster volumes by jdito · Pull Request #48774 · saltstack/salt

jdito · 2018-07-25T19:40:12Z

What does this PR do?

Adds the ability to create replica 3 arbiter 1 gluster volumes

What issues does this PR fix or reference?

#42955

Previous Behavior

Arbiter configuration was not exposed in glusterfs volume creation

New Behavior

Volumes can be created with arbiter (metadata-only replication) bricks

Tests written?

No

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

jdito@sum-dev-03:/data/salt/salt/gluster$ cat cluster-startup.sls 
peer-cluster:
  glusterfs.peered:
    - names:
      - sum-glfiler-01.storage.dy.gl
      - sum-glfiler-02.storage.dy.gl
      - sum-glfiler-03.storage.dy.gl

{% for volume in ['users','public'] %}
{{ volume }}:
  glusterfs.volume_present:
    - bricks:
      - sum-glfiler-01.storage.dy.gl:/gluster/{{ volume }}/brick
      - sum-glfiler-02.storage.dy.gl:/gluster/{{ volume }}/brick
      - sum-glfiler-03.storage.dy.gl:/gluster/{{ volume }}/brick
    - replica: 3
    - arbiter: True
    - start: True
    - force: True

{% endfor %}

[root@sum-glfiler-03 ~]# salt-call state.apply gluster.cluster-startup
local:
----------
          ID: peer-cluster
    Function: glusterfs.peered
        Name: sum-glfiler-01.storage.dy.gl
      Result: True
     Comment: Host sum-glfiler-01.storage.dy.gl already peered
     Started: 15:31:24.035879
    Duration: 64.799 ms
     Changes:   
----------
          ID: peer-cluster
    Function: glusterfs.peered
        Name: sum-glfiler-02.storage.dy.gl
      Result: True
     Comment: Host sum-glfiler-02.storage.dy.gl already peered
     Started: 15:31:24.101094
    Duration: 58.168 ms
     Changes:   
----------
          ID: peer-cluster
    Function: glusterfs.peered
        Name: sum-glfiler-03.storage.dy.gl
      Result: True
     Comment: Peering with localhost is not needed
     Started: 15:31:24.159656
    Duration: 33.415 ms
     Changes:   
----------
          ID: users
    Function: glusterfs.volume_present
      Result: True
     Comment: Volume users is created and is started
     Started: 15:31:24.193509
    Duration: 4356.89 ms
     Changes:   
              ----------
              new:
                  - users
              old:
----------
          ID: public
    Function: glusterfs.volume_present
      Result: True
     Comment: Volume public is created and is started
     Started: 15:31:28.550847
    Duration: 3752.007 ms
     Changes:   
              ----------
              new:
                  - public
                  - users
              old:
                  - users

Summary for local
------------
Succeeded: 5 (changed=2)
Failed:    0
------------
Total states run:     5
Total run time:   8.265 s
[root@sum-glfiler-03 ~]# gluster volume info
 
Volume Name: public
Type: Replicate
Volume ID: 395e9b53-434f-4a07-9f55-5500ba7499ff
Status: Started
Snapshot Count: 0
Number of Bricks: 1 x (2 + 1) = 3
Transport-type: tcp
Bricks:
Brick1: sum-glfiler-01.storage.dy.gl:/gluster/public/brick
Brick2: sum-glfiler-02.storage.dy.gl:/gluster/public/brick
Brick3: sum-glfiler-03.storage.dy.gl:/gluster/public/brick (arbiter)
Options Reconfigured:
transport.address-family: inet
nfs.disable: on
performance.client-io-threads: off
 
Volume Name: users
Type: Replicate
Volume ID: 787af828-f09b-47fb-b7b9-88486899438d
Status: Started
Snapshot Count: 0
Number of Bricks: 1 x (2 + 1) = 3
Transport-type: tcp
Bricks:
Brick1: sum-glfiler-01.storage.dy.gl:/gluster/users/brick
Brick2: sum-glfiler-02.storage.dy.gl:/gluster/users/brick
Brick3: sum-glfiler-03.storage.dy.gl:/gluster/users/brick (arbiter)
Options Reconfigured:
transport.address-family: inet
nfs.disable: on
performance.client-io-threads: off

rallytime

Thanks for submitting this addition @jdito - I have a couple of small requests.

rallytime · 2018-07-26T15:43:31Z

salt/modules/glusterfs.py


-def create_volume(name, bricks, stripe=False, replica=False, device_vg=False,
-           transport='tcp', start=False, force=False):
+def create_volume(name, bricks, stripe=False, replica=False, arbiter=False,


Can you move the new kwarg to the end of the list? We don't want to create an API change with this new addition.

rallytime · 2018-07-26T15:43:55Z

salt/modules/glusterfs.py

+        Valid configuration limited to "replica 3 arbiter 1" per \
+        Gluster documentation. Every third brick in the brick list \
+        is used as an arbiter brick.
+


Can you add a .. versionadded:: Fluorine tag to these new docs?

Done-ish? I wasn't 100% sure on the proper syntax for that tag. I added it just above the new documentation I added, but it looks slightly janky. Let me know if it's OK as-is, or if it should be done differently.

Oh, you're close. It needs to be below the arg name. Something like this:

arbiter words words words .. versionadded:: Fluorine

Ah! That looks much better. I tried putting it under initially, but didn't have a blank line after the "words words words" bit, so it didn't interpret it as a tag. Fixed now, thanks!

Sure thing! Thanks for fixing this up so quickly!

rallytime · 2018-07-26T15:44:23Z

salt/states/glusterfs.py

-def volume_present(name, bricks, stripe=False, replica=False, device_vg=False,
-                   transport='tcp', start=False, force=False):
+def volume_present(name, bricks, stripe=False, replica=False, arbiter=False,
+                   device_vg=False, transport='tcp', start=False, force=False):


Same comment here about the API change.

rallytime · 2018-07-26T15:44:39Z

salt/states/glusterfs.py

+        replica count for volume
+
+    arbiter
+        use every third brick as arbiter (metadata only)


This needs a version tag too. :)

rallytime · 2018-07-26T19:16:18Z

salt/modules/glusterfs.py

+        Valid configuration limited to "replica 3 arbiter 1" per \
+        Gluster documentation. Every third brick in the brick list \
+        is used as an arbiter brick.
+


Sure thing! Thanks for fixing this up so quickly!

Joe DiTommasso and others added 3 commits July 25, 2018 15:27

Added ability to create replica 3 arbiter 1 gluster volumes

c92fec6

Merge branch 'develop' into add-gluster-arbiter

93ade60

Lint fix

c36e62c

rallytime suggested changes Jul 26, 2018

View reviewed changes

Joe DiTommasso added 3 commits July 26, 2018 12:37

Updates requested by @rallytime

0d0dc35

Lint fix

f9f5d67

Fixing versionadded tags

7fae90c

rallytime approved these changes Jul 26, 2018

View reviewed changes

rallytime merged commit f428d2a into saltstack:develop Jul 26, 2018

rallytime mentioned this pull request Jul 26, 2018

Glusterfs - support for arbiter node #42955

Closed

jdito deleted the add-gluster-arbiter branch July 26, 2018 20:45

Conversation

jdito commented Jul 25, 2018

What does this PR do?

What issues does this PR fix or reference?

Previous Behavior

New Behavior

Tests written?

Commits signed with GPG?

Uh oh!

rallytime left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants