Skip to content

Commit

Permalink
Add trace-viewer to thirdparty
Browse files Browse the repository at this point in the history
This adds a built version of the trace-viewer HTML and JS to thirdparty
via our S3 mirror. I included instructions on how to build it, and the
build script itself provides some instructions how to upload to S3.

The particular branch of trace-viewer being built is slightly customized
to Kudu -- I removed some Chrome-specific stuff and cloned it into its
own part of the trace-viewer repository tree. If we see fit, we can extend
it with Kudu-specific object visualizations, etc.

Tested the result by starting a TS and loading /tracing.html

Change-Id: I0eaaaca925ec364da03d9fa15df0834935a23735
Reviewed-on: http://gerrit.sjc.cloudera.com:8080/5783
Tested-by: jenkins
Reviewed-by: Adar Dembo <[email protected]>
  • Loading branch information
toddlipcon committed Jan 20, 2015
1 parent 0ee3218 commit dcdc1f2
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ nbproject/
.project
.cproject
.csettings/

# WWW dependencies which are not checked in directly
www/tracing.*
30 changes: 30 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,36 @@ thirdparty/snappy-*/
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
thirdparty/kudu-trace-viewer-*/
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
thirdparty/zlib-*/

Expand Down
7 changes: 7 additions & 0 deletions thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ else
"crcutil") F_CRCUTIL=1 ;;
"libunwind") F_LIBUNWIND=1 ;;
"llvm") F_LLVM=1 ;;
"trace-viewer") F_TRACE_VIEWER=1 ;;
*) echo "Unknown module: $arg"; exit 1 ;;
esac
done
Expand Down Expand Up @@ -275,6 +276,12 @@ if [ -n "$F_ALL" -o -n "$F_LLVM" ]; then
make -j$PARALLEL install
fi

# Build trace-viewer (by copying it into www/)
if [ -n "$F_ALL" -o -n "$F_TRACE_VIEWER" ]; then
echo Installing trace-viewer into the www directory
cp -a $TRACE_VIEWER_DIR/* $TP_DIR/../www/
fi

# Remove any old thirdparty deps which hung around from previous versions
rm -f $PREFIX/lib/libsasl*
rm -Rf $PREFIX/lib/sasl2
Expand Down
4 changes: 4 additions & 0 deletions thirdparty/download-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,9 @@ if [ ! -d $LLVM_DIR ]; then
echo
fi

if [ ! -d $TRACE_VIEWER_DIR ]; then
fetch_and_expand kudu-trace-viewer-${TRACE_VIEWER_VERSION}.tar.gz
fi

echo "---------------"
echo "Thirdparty dependencies downloaded successfully"
9 changes: 9 additions & 0 deletions thirdparty/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,12 @@ LIBUNWIND_DIR=$TP_DIR/libunwind-${LIBUNWIND_VERSION}
LLVM_VERSION=3.4.2
LLVM_DIR=$TP_DIR/llvm-${LLVM_VERSION}.src
LLVM_BUILD=$TP_DIR/llvm-${LLVM_VERSION}.build

# Our trace-viewer repository is separate since it's quite large and
# shouldn't change frequently. We upload the built artifacts (HTML/JS)
# when we need to roll to a new revision.
#
# The source can be found at https://github.com/cloudera/kudu-trace-viewer
# and built with "kudu-build.sh" included within the repository.
TRACE_VIEWER_VERSION=f0f132051837fba4e57c8a7603331aa9c90151f4
TRACE_VIEWER_DIR=$TP_DIR/kudu-trace-viewer-${TRACE_VIEWER_VERSION}

0 comments on commit dcdc1f2

Please sign in to comment.