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

Add xcat marker in goconserver configuration file #4603

Merged
merged 1 commit into from
Jan 5, 2018

Conversation

chenglch
Copy link
Contributor

@chenglch chenglch commented Jan 4, 2018

Previously, it is impossible to know if the goconerver is started
by xcat. This patch add a marker in /etc/goconserver/server.conf
to help check the status. In addition, use server-cred.pem instead
of server-key.pem as it is not exist on SN.

This patch also control the service status of goconserver and conserver
when restarting the xcatd service on service node.

implement: #4542

[root@sn02 ~]# chdef sn02 setupconserver=1
1 object definitions have been created or modified.
[root@sn02 ~]# service xcatd restart
Restarting xcatd (via systemctl):                          [  OK  ]
[root@sn02 ~]# ps -ef | grep conserver
root      27679      1  0 02:26 ?        00:00:00 /usr/sbin/conserver -o -O1 -d
root      27680  27679  0 02:26 ?        00:00:00 /usr/sbin/conserver -o -O1 -d
root      27756  26188  0 02:26 pts/1    00:00:00 grep --color=auto conserver
[root@sn02 ~]# chdef sn02 setupconserver=2
1 object definitions have been created or modified.
[root@sn02 ~]# service xcatd restart
Restarting xcatd (via systemctl):                          [  OK  ]
[root@sn02 ~]#
[root@sn02 ~]#
[root@sn02 ~]#
[root@sn02 ~]# ps -ef | grep conserver
root      27885      1  0 02:26 ?        00:00:00 /usr/bin/goconserver
root      27986  26188  0 02:33 pts/1    00:00:00 grep --color=auto conserver

Previously, it is impossible to know if the goconerver is started
by xcat. This patch add a marker in /etc/goconserver/server.conf
to help check the status. In addition, use server-cred.pem instead
of server-key.pem as it is not exist on SN.

This patch also control the service status of goconserver and conserver
when restarting the xcatd service on service node.

```
[root@sn02 ~]# chdef sn02 setupconserver=1
1 object definitions have been created or modified.
[root@sn02 ~]# service xcatd restart
Restarting xcatd (via systemctl):                          [  OK  ]
[root@sn02 ~]# ps -ef | grep conserver
root      27679      1  0 02:26 ?        00:00:00 /usr/sbin/conserver -o -O1 -d
root      27680  27679  0 02:26 ?        00:00:00 /usr/sbin/conserver -o -O1 -d
root      27756  26188  0 02:26 pts/1    00:00:00 grep --color=auto conserver
[root@sn02 ~]# chdef sn02 setupconserver=2
1 object definitions have been created or modified.
[root@sn02 ~]# service xcatd restart
Restarting xcatd (via systemctl):                          [  OK  ]
[root@sn02 ~]#
[root@sn02 ~]#
[root@sn02 ~]#
[root@sn02 ~]# ps -ef | grep conserver
root      27885      1  0 02:26 ?        00:00:00 /usr/bin/goconserver
root      27986  26188  0 02:33 pts/1    00:00:00 grep --color=auto conserver
```
@xcatbot
Copy link

xcatbot commented Jan 4, 2018

CI CHECK RESULT : > PR FORMAT CORRECT> BUILD SUCCESSFUL > INSTALL XCAT SUCCESSFUL> CODE SYNTAX CORRECT> FAST REGRESSION TEST Successful: Totalcase 215 Pass 215 failed 0

@zet809
Copy link

zet809 commented Jan 5, 2018

Looks good to me, I agree to merge. Thx, @chenglch

@zet809 zet809 merged commit ca75ab6 into xcat2:master Jan 5, 2018
@chenglch chenglch added this to the 2.13.10 milestone Jan 5, 2018
@chenglch chenglch deleted the gocons branch January 9, 2018 09:04
@whowutwut whowutwut changed the title Add xcat marker in gocnoserver configuration file Add xcat marker in goconserver configuration file Feb 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants