You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by su...@apache.org on 2016/11/01 21:18:40 UTC
incubator-atlas git commit: ATLAS-1248 /bin/atlas_stop.py not killing
the process and process is found alive even after 30 secs (zhangqiang2 via
sumasai)
Repository: incubator-atlas
Updated Branches:
refs/heads/master 29880e77c -> 315b5d184
ATLAS-1248 /bin/atlas_stop.py not killing the process and process is found alive even after 30 secs (zhangqiang2 via sumasai)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/315b5d18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/315b5d18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/315b5d18
Branch: refs/heads/master
Commit: 315b5d184b4d0dda414693573c8f5e7e880c19f9
Parents: 29880e7
Author: Suma Shivaprasad <su...@gmail.com>
Authored: Tue Nov 1 14:18:17 2016 -0700
Committer: Suma Shivaprasad <su...@gmail.com>
Committed: Tue Nov 1 14:18:17 2016 -0700
----------------------------------------------------------------------
distro/src/bin/atlas_stop.py | 13 +++++++++++--
release-log.txt | 1 +
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/315b5d18/distro/src/bin/atlas_stop.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/atlas_stop.py b/distro/src/bin/atlas_stop.py
index 89b1bb3..a2b1c31 100755
--- a/distro/src/bin/atlas_stop.py
+++ b/distro/src/bin/atlas_stop.py
@@ -16,10 +16,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import os
-from signal import SIGTERM
+from signal import SIGTERM, SIGKILL
import sys
import traceback
-
+import time
import atlas_config as mc
def main():
@@ -63,6 +63,15 @@ def main():
# stop hbase
if mc.is_hbase_local(confdir):
mc.run_hbase_action(mc.hbaseBinDir(atlas_home), "stop", None, None, True)
+
+ #after 30 seconds kill it
+ time.sleep(30)
+ if mc.exist_pid(pid):
+ try:
+ sys.stderr.write("did not stop gracefully after 30 seconds seconds: killing with SIGKILL\n")
+ os.kill(pid, SIGKILL)
+ except:
+ pass
if __name__ == '__main__':
try:
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/315b5d18/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index e44d8ef..fd8ee7b 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES:
+ATLAS-1248 /bin/atlas_stop.py not killing the process and process is found alive even after 30 secs (zhangqiang2 via sumasai)
ATLAS-1258 BugFix for Indexer NPE on StructDef lookup (apoorvnaik via sumasai)
ATLAS-1233 UnitTests for the TypeDefStores (apoorvnaik via sumasai)
ATLAS-1240 Adding Change listeners to react on changes in TypesDef (apoorvnaik via sumasai)