Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
9890de09
Commit
9890de09
authored
13 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Patches
Plain Diff
package-rpm: cosmetic fixes before a merge into main.
parent
49e779c8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
extra/tarantool
+7
-1
7 additions, 1 deletion
extra/tarantool
extra/tarantool_expand.sh
+6
-6
6 additions, 6 deletions
extra/tarantool_expand.sh
with
13 additions
and
7 deletions
extra/tarantool
+
7
−
1
View file @
9890de09
...
...
@@ -14,7 +14,13 @@ export PIDFILE="/var/${INST}/pid"
export
WRAP_PIDFILE
=
"/var/
${
INST
}
/wrapper.pid"
export
OPTIONS
=
""
# We must not run immediate!
# This script is normally invoked via a symlink.
# An own symlink is created for each instance.
# E.g., in case of 4 instances, there are symlinks
# tarantool0, tarantool1, tarantool2, tarantool3.
# If, for some reason, this script is invoked not via
# a symlink, do nothing.
#
if
[
"
${
INST
}
"
==
"tarantool"
]
then
echo_failure
...
...
This diff is collapsed.
Click to expand it.
extra/tarantool_expand.sh
+
6
−
6
View file @
9890de09
...
...
@@ -26,7 +26,7 @@
#
#
# Tarantool
DB
expan
d
script
# Tarantool
instance
expan
sion
script
#
prompt_name
=
`
basename
$0
`
...
...
@@ -47,7 +47,7 @@ log() {
}
usage
()
{
echo
"Tarantool
DB
expan
d
script"
echo
"Tarantool expan
sion
script
: add more Tarantool instances.
"
echo
"usage: tarantool_expand.sh [options] <instances>"
echo
echo
" --prefix <path> installation path (/usr/local)"
...
...
@@ -92,7 +92,7 @@ rollback() {
try
()
{
cmd
=
"
$*
"
[
$act_debug
-gt
0
]
&&
log
$cmd
if
[
$act_dry
-eq
0
]
;
then
if
[
$act_dry
-eq
0
]
;
then
eval
$cmd
if
[
$?
-gt
0
]
;
then
rollback
...
...
@@ -122,7 +122,7 @@ deploy_instance() {
# setting up wrapper
try
"ln -s
\"
${
prefix
}
/bin/tarantool_multi.sh
\"
\"
${
prefix
}
/bin/tarantool
$id
.sh
\"
"
# setting up startup script
try
"ln -s
\"
${
prefix_etc
}
/init.d/tarantool
\"
\"
${
prefix_etc
}
/init.d/tarantool
$id
\"
"
}
...
...
@@ -184,7 +184,7 @@ if [ -f $deploy_cfg ]; then
fi
# displaying status
if
[
$act_status
-ne
0
]
;
then
if
[
$act_status
-ne
0
]
;
then
if
[
$deploy_exists
-eq
0
]
;
then
log
"no tarantool instances found."
else
...
...
@@ -199,7 +199,7 @@ is_num_positive $deploy_count
if
[
$deploy_count
-le
$deploy_current
]
;
then
error
"expand only is supported (required instances number
$deploy_count
"
\
"is lower/equal than deployed
$deploy_current
)"
"is lower/equal than deployed
$deploy_current
)"
fi
# asking permission to continue
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment