database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-29 03:22:01 +03:00
Code Activity

MCOL-452

Browse Source
This commit is contained in:
David Hill
2016-12-08 13:15:55 -06:00
parent 9152d920eb
commit 10b0199e81
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/install_scripts/performance_installer.sh
View File

@@ -144,7 +144,7 @@ expect {
-re {[$#] } { } -re {[$#] } { }
} }
send "scp $HOME/mariadb-columnstore*$VERSION*rpm $USERNAME@$SERVER:.;$PKGERASE dummy\n" send "scp $HOME/mariadb-columnstore*$VERSION*$PKGTYPE $USERNAME@$SERVER:.;$PKGERASE1 dummy\n"
if { $PASSWORD != "ssh" } { if { $PASSWORD != "ssh" } {
set timeout 30 set timeout 30
expect { expect {
@@ -172,7 +172,7 @@ if { $INSTALLTYPE == "initial"} {
# #
send_user "Install MariaDB Columnstore Packages on Module " send_user "Install MariaDB Columnstore Packages on Module "
send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE dummy'\n" send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE1 dummy'\n"
if { $PASSWORD != "ssh" } { if { $PASSWORD != "ssh" } {
set timeout 30 set timeout 30
expect { expect {

4
oam/install_scripts/user_installer.sh
View File

@@ -146,7 +146,7 @@ expect {
-re {[$#] } { } -re {[$#] } { }
} }
send "scp $HOME/mariadb-columnstore*$VERSION*rpm $USERNAME@$SERVER:.;$PKGERASE dummy\n" send "scp $HOME/mariadb-columnstore*$VERSION*$PKGTYPE $USERNAME@$SERVER:.;$PKGERASE1 dummy\n"
if { $PASSWORD != "ssh" } { if { $PASSWORD != "ssh" } {
set timeout 30 set timeout 30
expect { expect {
@@ -174,7 +174,7 @@ if { $INSTALLTYPE == "initial"} {
# install package # install package
# #
send_user "Install MariaDB ColumnStore Packages on Module " send_user "Install MariaDB ColumnStore Packages on Module "
send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE dummy'\n" send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE1 dummy'\n"
if { $PASSWORD != "ssh" } { if { $PASSWORD != "ssh" } {
set timeout 30 set timeout 30
expect { expect {

13
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -1889,13 +1889,6 @@ int processCommand(string* arguments)
case 14: // addDbroot parameters: dbroot-number case 14: // addDbroot parameters: dbroot-number
{ {
parentOAMModule = getParentOAMModule();
if ( localModule != parentOAMModule ) {
//exit out since not on Parent OAM Module
cout << endl << "**** addDbroot Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
break;
}
string GlusterConfig = "n"; string GlusterConfig = "n";
try { try {
oam.getSystemConfig( "GlusterConfig", GlusterConfig); oam.getSystemConfig( "GlusterConfig", GlusterConfig);
@@ -1985,12 +1978,6 @@ int processCommand(string* arguments)
case 15: // removeDbroot parameters: dbroot-list case 15: // removeDbroot parameters: dbroot-list
{ {
parentOAMModule = getParentOAMModule();
if ( localModule != parentOAMModule ) {
//exit out since not on Parent OAM Module
cout << endl << "**** removeDbroot Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
break;
}
string GlusterConfig = "n"; string GlusterConfig = "n";
try { try {