You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ok...@apache.org on 2022/03/03 15:21:07 UTC
[madlib] branch master updated (be297fe -> 44ca0ef)
This is an automated email from the ASF dual-hosted git repository.
okislal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git.
from be297fe Add JIRA numbers to the RELEASE_NOTES
new 67a3246 Revert "Build: Add OSX tarball for release"
new 496ce5d Add error checking for pg_ctl, gpconfig and gpstop
new 44ca0ef Fix jenkins docker parameter ordering
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 30 ++----------------------------
deploy/CMakeLists.txt | 12 ------------
deploy/Readme_OSX | 24 ------------------------
deploy/link_madlib_folders.sh | 19 -------------------
src/madpack/madpack.py | 12 ++++++++----
tool/jenkins/jenkins_build.sh | 4 ++--
6 files changed, 12 insertions(+), 89 deletions(-)
delete mode 100644 deploy/Readme_OSX
delete mode 100755 deploy/link_madlib_folders.sh
[madlib] 02/03: Add error checking for pg_ctl, gpconfig and gpstop
Posted by ok...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
okislal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 496ce5d485a5a5a7673a445988cb7561fb4ab31c
Author: Orhan Kislal <ok...@apache.org>
AuthorDate: Thu Feb 24 18:50:01 2022 -0500
Add error checking for pg_ctl, gpconfig and gpstop
---
src/madpack/madpack.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/madpack/madpack.py b/src/madpack/madpack.py
index 9380715..d7982be 100755
--- a/src/madpack/madpack.py
+++ b/src/madpack/madpack.py
@@ -1311,15 +1311,19 @@ def set_dynamic_library_path_in_database(dbver_split, madlib_library_path):
if portid == 'greenplum':
if is_rev_gte(dbver_split, get_rev_num('6.0')):
- os.system('gpconfig -c dynamic_library_path -v \'{0}\''.format(dynamic_library_path))
+ ret = os.system('gpconfig -c dynamic_library_path -v \'{0}\''.format(dynamic_library_path))
else:
- os.system('gpconfig -c dynamic_library_path -v \'\\{0}\''.format(dynamic_library_path))
- os.system('gpstop -u')
+ ret = os.system('gpconfig -c dynamic_library_path -v \'\\{0}\''.format(dynamic_library_path))
+ ret = ret + os.system('gpstop -u')
+ if ret != 0:
+ error_(this, "cannot run gpconfig or gpstop", True)
else:
_internal_run_query(
"ALTER SYSTEM SET dynamic_library_path TO '{0}'".format(dynamic_library_path), True)
pg_data_directory = _internal_run_query("SHOW data_directory", True)[0]['data_directory']
- os.system('pg_ctl -D {0} reload'.format(pg_data_directory))
+ ret = os.system('pg_ctl -D {0} reload'.format(pg_data_directory))
+ if ret != 0:
+ error_(this, "cannot run pg_ctl", True)
def main(argv):
[madlib] 03/03: Fix jenkins docker parameter ordering
Posted by ok...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
okislal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 44ca0ef433c0153880833ec789753210488d93b6
Author: Orhan Kislal <ok...@apache.org>
AuthorDate: Wed Mar 2 14:40:54 2022 -0500
Fix jenkins docker parameter ordering
---
tool/jenkins/jenkins_build.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tool/jenkins/jenkins_build.sh b/tool/jenkins/jenkins_build.sh
index 721ec43..6a1c0b8 100755
--- a/tool/jenkins/jenkins_build.sh
+++ b/tool/jenkins/jenkins_build.sh
@@ -74,9 +74,9 @@ docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake ../mad
echo "---------- Installing and running dev-check --------------------"
# Install MADlib and run dev check
cat <<EOF
-docker exec madlib bash -u postgres -c '/build/src/bin/madpack -s mad -p postgres -c postgres/postgres@localhost:5432/postgres install' | tee $workdir/logs/madlib_install.log
+docker exec -u postgres madlib bash -c '/build/src/bin/madpack -s mad -p postgres -c postgres/postgres@localhost:5432/postgres install' | tee $workdir/logs/madlib_install.log
EOF
-docker exec madlib bash -u postgres -c '/build/src/bin/madpack -s mad -p postgres -c postgres/postgres@localhost:5432/postgres install' | tee $workdir/logs/madlib_install.log
+docker exec -u postgres madlib bash -c '/build/src/bin/madpack -s mad -p postgres -c postgres/postgres@localhost:5432/postgres install' | tee $workdir/logs/madlib_install.log
cat <<EOF
docker exec madlib bash -c 'mkdir -p /tmp'
[madlib] 01/03: Revert "Build: Add OSX tarball for release"
Posted by ok...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
okislal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/madlib.git
commit 67a32465b219076fa2b46db537967c114f65801b
Author: Orhan Kislal <ok...@apache.org>
AuthorDate: Thu Feb 24 18:45:22 2022 -0500
Revert "Build: Add OSX tarball for release"
This reverts commit ccb0314347d512e9c8bf3e5c01ee91a14f9eaad5.
The OSX tarball has permission and security related issues. Better to
shelf this for a later release.
---
CMakeLists.txt | 30 ++----------------------------
deploy/CMakeLists.txt | 12 ------------
deploy/Readme_OSX | 24 ------------------------
deploy/link_madlib_folders.sh | 19 -------------------
4 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2990a55..1d9199e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,14 +313,8 @@ install(
DESTINATION .
COMPONENT core
)
-if(APPLE)
- install(
- FILES
- "${CMAKE_CURRENT_SOURCE_DIR}/deploy/Readme_OSX"
- "${CMAKE_CURRENT_SOURCE_DIR}/deploy/link_madlib_folders.sh"
- DESTINATION .
- )
-endif()
+
+
# -- Add subdirectories --------------------------------------------------------
add_subdirectory(src)
@@ -389,23 +383,3 @@ install(CODE "
)
")
-if(APPLE)
- install(CODE "
- EXECUTE_PROCESS(COMMAND mv
- ${CMAKE_MADLIB_ROOT}/Current/Readme_OSX
- ${CMAKE_MADLIB_ROOT}/Readme_OSX
- )
- ")
- install(CODE "
- EXECUTE_PROCESS(COMMAND mv
- ${CMAKE_MADLIB_ROOT}/Current/link_madlib_folders.sh
- ${CMAKE_MADLIB_ROOT}/link_madlib_folders.sh
- )
- ")
- install(CODE "
- EXECUTE_PROCESS(COMMAND chmod
- a+x
- ${CMAKE_MADLIB_ROOT}/link_madlib_folders.sh
- )
- ")
-endif()
diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index 6cb8c62..e727e92 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -129,15 +129,3 @@ foreach(PORT_COMPONENT ${PORT_COMPONENTS})
include("${PORT_COMPONENT}")
endforeach(PORT_COMPONENT)
-if(APPLE)
- configure_file(
- link_madlib_folders.sh
- "${CMAKE_CURRENT_BINARY_DIR}/link_madlib_folders.sh"
- USE_SOURCE_PERMISSIONS
- )
- configure_file(
- Readme_OSX
- "${CMAKE_CURRENT_BINARY_DIR}/Readme_OSX"
- @ONLY
- )
-endif()
diff --git a/deploy/Readme_OSX b/deploy/Readme_OSX
deleted file mode 100644
index f430734..0000000
--- a/deploy/Readme_OSX
+++ /dev/null
@@ -1,24 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-MADlib Package Usage for OSX
-
-This tarball is generated for using MADlib on OSX devices.
-Please run the link_madlib_folders.sh file to create links necessary for usage.
-Note that this file needs to be run from the directory that it's located in. If
-it's run from somewhere else, it will not work and that it might have unintended
-side effects like an unrelated file getting deleted.
-
-Please note that this package cannot be used in any other operation system.
diff --git a/deploy/link_madlib_folders.sh b/deploy/link_madlib_folders.sh
deleted file mode 100755
index ceb78df..0000000
--- a/deploy/link_madlib_folders.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-rm Current bin doc
-ln -nsf Versions/$(ls -r Versions/ | head -1) ./Current
-ln -nsf Current/bin ./bin
-ln -nsf Current/doc ./doc