diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index c0c8fe2d4..cb5e022d7 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -88,6 +88,7 @@ docs/README.md
 docker/README.md
 be/src/thirdparty/pcg-cpp-0.98/README.md
 lib/python/README.md
+lib/python/impala_py_lib/gdb/README.md
 
 # http://www.apache.org/legal/src-headers.html: "Test data for which the addition of a
 # source header would cause the tests to fail."
diff --git a/lib/python/impala_py_lib/gdb/README.md b/lib/python/impala_py_lib/gdb/README.md
new file mode 100644
index 000000000..e9ef8550a
--- /dev/null
+++ b/lib/python/impala_py_lib/gdb/README.md
@@ -0,0 +1,43 @@
+## What is impala-gdb.py?
+
+This is a collection of Python GDB functions (macros) that can be invoked from a GDB
+session to aid analysis of Impala core dumps.
+
+To use the functions, source impala-gdb.py as follows:
+
+```
+
+(gdb) source $IMPALA_HOME/lib/python/impala_py_lib/gdb/impala-gdb.py
+
+```
+
+Currently, the following functions are available:
+
+```
+1. find-query-ids
+2. find-fragment-instances
+```
+
+Here's a sample interaction:
+
+```
+(gdb) help find-query-ids
+Find IDs of all queries this impalad is currently executing.
+(gdb) find-query-ids
+f74c863dff66a34d:1d983cc300000000
+364525e12495932b:73f5dd0200000000
+bc4a3eec25481981:edda04b800000000
+(gdb)
+(gdb)
+(gdb) help find-fragment-instances
+Find all query fragment instance to thread Id mappings in this impalad.
+(gdb) find-fragment-instances
+Fragment Instance Id  Thread IDs
+
+364525e12495932b:73f5dd02000000a2 [69]
+364525e12495932b:73f5dd0200000171 [196, 136]
+bc4a3eec25481981:edda04b8000001a8 [252, 237, 206]
+f74c863dff66a34d:1d983cc30000009b [200, 14, 13, 12, 6, 5, 3, 2]
+f74c863dff66a34d:1d983cc30000013a [4]
+(gdb)
+```
diff --git a/lib/python/impala_py_lib/gdb/impala-gdb.py b/lib/python/impala_py_lib/gdb/impala-gdb.py
new file mode 100644
index 000000000..904b77125
--- /dev/null
+++ b/lib/python/impala_py_lib/gdb/impala-gdb.py
@@ -0,0 +1,99 @@
+#
+# 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.
+#
+# A collection of useful Python GDB modules and commands for
+# debugging Impala core dumps.
+#
+import gdb
+from collections import defaultdict
+
+
+def get_fragment_instances():
+    # Walk the threadlist to find fragment instance ids. Assumes IMPALA-6416, so
+    # this will not work with releases older than Impala 2.12. It may be possible
+    # to search for FragmentInstanceState::Exec() in the older releases to get
+    # to the FInstIDs. Returns a dictionary of FInstID->[gdb thread ID].
+    # Note that multiple threads might be doing tasks for the same FInstID.
+
+    fragment_instances = defaultdict(list)
+    for thread in gdb.selected_inferior().threads():
+        thread.switch()
+
+        f = gdb.newest_frame()
+        while f:
+            # Skip unresolved frame
+            if gdb.Frame.name(f) is None:
+                f = gdb.Frame.older(f)
+                continue
+            if 'impala::Thread::SuperviseThread' in gdb.Frame.name(f):
+                gdb.Frame.select(f)
+                block = gdb.Frame.block(f)
+                gdb.lookup_symbol('parent_thread_info', block)
+                p = f.read_var('parent_thread_info')
+                # No valid parent_thread_info pointer
+                if not p:
+                    break
+                v = p.dereference()
+                fi = str(v['instance_id_'])
+                if ':' in fi:
+                    fragment_instances[fi.strip('"')].append(thread.num)
+                break
+            f = gdb.Frame.older(f)
+    return fragment_instances
+
+
+class FindFragmentInstances(gdb.Command):
+    """Find all query fragment instance to thread Id mappings in this impalad."""
+
+    def __init__(self):
+        super(FindFragmentInstances, self).__init__(
+            "find-fragment-instances",
+            gdb.COMMAND_SUPPORT,
+            gdb.COMPLETE_NONE,
+            False)
+
+    def invoke(self, arg, from_tty):
+        fragment_instances = get_fragment_instances()
+        print('Fragment Instance Id\tThread IDs\n')
+        for fid in sorted(fragment_instances):
+            print("{}\t{}".format(fid, fragment_instances[fid]))
+
+
+class FindQueryIds(gdb.Command):
+    """Find IDs of all queries this impalad is currently executing."""
+
+    def __init__(self):
+        super(FindQueryIds, self).__init__(
+            "find-query-ids",
+            gdb.COMMAND_SUPPORT,
+            gdb.COMPLETE_NONE,
+            False)
+
+    def invoke(self, arg, from_tty):
+        fragment_instances = get_fragment_instances()
+        query_ids = set()
+        for fi in fragment_instances:
+            qid_hi, qid_low = fi.split(':')
+            qid_low = format(int(qid_low, 16) & 0xFFFFFFFFFFFF0000, 'x')
+            query_ids.add("{}:{}".format(qid_hi, qid_low))
+        print('\n'.join(query_ids))
+
+
+# Instantiate the command classes so they can be invoked from within GDB
+FindFragmentInstances()
+FindQueryIds()