Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 518F210D9F for ; Fri, 6 Sep 2013 18:22:34 +0000 (UTC) Received: (qmail 60546 invoked by uid 500); 6 Sep 2013 18:22:34 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 60453 invoked by uid 500); 6 Sep 2013 18:22:32 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 59989 invoked by uid 99); 6 Sep 2013 18:22:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Sep 2013 18:22:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E7B6902A39; Fri, 6 Sep 2013 18:22:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 06 Sep 2013 18:22:29 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/53] [abbrv] ACCUMULO-656,ACCUMULO-658 Update package names Updated Branches: refs/heads/ACCUMULO-210 bc0aaf426 -> 9ae51d7ad (forced update) http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/server/server/src/main/resources/web/functions.js ---------------------------------------------------------------------- diff --git a/server/server/src/main/resources/web/functions.js b/server/server/src/main/resources/web/functions.js deleted file mode 100644 index f4bbdd1..0000000 --- a/server/server/src/main/resources/web/functions.js +++ /dev/null @@ -1,21 +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. -*/ -function toggle(selection) { - var p = document.getElementById(selection); - var style = p.className; - p.className = style == "hide" ? "show" : "hide"; -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/server/server/src/main/resources/web/screen.css ---------------------------------------------------------------------- diff --git a/server/server/src/main/resources/web/screen.css b/server/server/src/main/resources/web/screen.css deleted file mode 100644 index 7af3af3..0000000 --- a/server/server/src/main/resources/web/screen.css +++ /dev/null @@ -1,388 +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. -*/ -/* basic screen style for all pages */ -html,body { - height: 100%; - margin: 0; - padding: 0; - color: #333333; - font-size: 10pt; - font-family: verdana, arial, sans-serif; - text-align: center; -} - -#content-wrapper { - position: relative; - min-height: 100%; -} - -* #content-wrapper { - height: 100%; -} - -#content { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - padding-bottom: 0; -} - -#header { - position: absolute; - padding-top: 0; - top: 0; - left: 0; - right: 0; - height: 8.0em; - color: #c4c4c4; - background-color: #304065; - text-align: center; -} - -#banner { - height: 1.5em; - font-size: 1.0em; -} - -#headertitle { - position: absolute; - top: 0; - left: 0; - right: 0; -} - -#subheader { - position: absolute; - bottom: 0; - left: 0; - right: 0; - font-size: .92em; -} - -#footer { - position: absolute; - bottom: 0; - left: 0; - right: 0; - padding: 0; - height: 1.5em; - font-size: 1.0em; -} - -#main { - position: absolute; - top: 8.0em; - left: 11em; - right: 0; - bottom: 1.5em; - padding: 0.6em; - overflow: scroll; -} - -#nav { - position: absolute; - top: 8.0em; - left: 0; - bottom: 0; - padding: 0.5em; - width: 10em; - color: #304065; - background-color: #c4c4c4; - text-align: left; -} - -#nav-title { - margin-left: auto; - margin-right: auto; - text-align: center; - font-size: 1.1em; -} - -h1 { - font-size: 2.2em; - font-variant: small-caps; - text-align: center; -} - -h2 { - width: 100%; - font-size: 1.3em; - text-align: center; -} - -h2.error { - width: 100%; - color: #ff0000; - background-color: #000000; -} - -h2.error a { - color: #ff0000; - background-color: #000000; -} - -caption { - margin-left: auto; - margin-right: auto; -} - -caption.error { - color: #ff0000; - background-color: #000000; -} - -hr { - border: 0; - height: 1px; - background-color: #304065; - color: #304065; -} - -table { - margin-left: auto; - margin-right: auto; - min-width: 60%; - border: 1px #333333 solid; - border-spacing-top: 0; - border-spacing-bottom: 0; - font-size: 9pt; - border: 1px #333333 solid; - border: 1px #333333 solid; -} - -/* -The following is to avoid a problem with the flot -javascript library. This file sets min-width to 60% -for all tables. This make the html generated by -flot.js not work. Flot creates a class called legend -used in a div that has a child table. This sets -min-width to 0 for that child table enabling it -to render correctly. -*/ -div.legend > table { - min-width: 0%; -} - -table.sortable { - border-left: 0; - border-right: 0; - border-top: 1px #333333 dotted; - border-bottom: 1px #333333 dotted; -} - -td { - border-top: 0; - border-bottom: 0; - border-left: 0; - border-right: 0; - border-spacing-top: 0; - border-spacing-bottom: 0; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.15em; - padding-bottom: 0.15em; - color: #333333; -} - -th { - border-top: 0; - border-bottom: 3px #333333 solid; - border-left: 1px #333333 dotted; - border-right: 0; - border-spacing-top: 0; - border-spacing-bottom: 0; - text-align: center; - font-variant: small-caps; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.2em; - padding-bottom: 0.2em; - color: #333333; - font-size: 10pt; - vertical-align: bottom; -} - -td.firstcell { - border-left: 0; -} - -th.firstcell { - border-left: 0; -} - -a { - text-decoration: none; - color: #0000ff; - line-height: 1.5em; -} - -a:hover { - color: #004400; - text-decoration: underline; -} - -a img { - border: 0px; -} - -div.show { - display: block; -} - -div.hide { - display: none; -} - -div.progress-chart { - border: 1px solid #333333; - border-spacing: 0; - width: 150px; - float: left; -} - -div.progress-chart>div { - height: 20px; - background-color: #0000ff; -} - -pre.logevent { - margin: 0; -} - -.noborder { - border: 0; - border-spacing: 0; - border-bottom: 0; - border-right: 0; -} - -.noborder td { - vertical-align: top; -} - -.table-caption { - font-size: 2em; - font-variant: small-caps; - text-align: center; -} - -.table-subcaption { - font-size: 0.9em; -} - -.left { - text-align: left; -} - -.right { - text-align: right; - margin-right: 0; -} - -.error { - color: #ffffff; - background-color: #ff0000; -} - -.error a { - color: #ffffff; - background-color: #ff0000; -} - -.warning { - background-color: #ffff33; -} - -.highlight { - background-color: #cef4b5; -} - -.smalltext { - font-size: 0.8em; -} - -.center { - text-align: center; - padding: 0.5em; -} - -.plotHeading { - text-align: center; - font-size: 1.5em; -} -.nowrap { - white-space:nowrap; -} - -.viscontrol { - border: 1px solid #c4c4c4; - padding: 5px; -} - -#vishoverinfo { - visibility: hidden; - position: absolute; - border: 1px solid #c4c4c4; - background-color: #ffffff; -} - -#shell { - text-align: left; - color: #55d839; - border: 1px; - padding-left: 5px; - background-color: #000000; - height: 40em; - overflow: auto; - font-family: Monaco, monospace; - font-size: 100%; -} - -#shell span { - display: inline; -} - -#shell input { - display: inline; - border: none; - width: 60%; - color: #55d839; - background-color: #000000; - font-family: Monaco, monospace; - font-size: 100%; -} - -#shell pre { - font-family: Monaco, monospace; - font-size: 100%; -} - -#login { - text-align: left; -} - -#login table { - margin-left: 0; - min-width: 0%; -} - -#loginError { - text-align: left; - color: red; -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/server/server/src/main/resources/web/up.gif ---------------------------------------------------------------------- diff --git a/server/server/src/main/resources/web/up.gif b/server/server/src/main/resources/web/up.gif deleted file mode 100644 index b272cbb..0000000 Binary files a/server/server/src/main/resources/web/up.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/server/server/src/main/resources/web/vis.js ---------------------------------------------------------------------- diff --git a/server/server/src/main/resources/web/vis.js b/server/server/src/main/resources/web/vis.js deleted file mode 100644 index c0f8b3f..0000000 --- a/server/server/src/main/resources/web/vis.js +++ /dev/null @@ -1,409 +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. - */ - -// size and spacing variables -var dotSpacing = 10; // spacing between centers of dots (radius) -var dotPadding = 0.5; // dot padding -var minDotRadius = 3; // min dot radius -var maxDotRadius = dotSpacing - dotPadding; - -// arrays of information about each dot -var stats = {'servers': []}; -var dots = new Array(0); // current sizes and change directions -var mousedDot = -1; // the dot currently under the mouse - -var colorPalette = ['#0000CC', '#0014B8', '#0029A3', '#003D8F', '#00527A', '#006666', '#007A52', '#008F3D', '#00A329', '#00B814', '#00CC00', '#14D100', '#29D600', '#3DDB00', '#52E000', '#66E600', '#7AEB00', '#8FF000', '#A3F500', '#B8FA00', '#CCFF00', '#CCFF00', '#CCF200', '#CCE600', '#CCD900', '#CCCC00', '#CCBF00', '#CCB200', '#CCA600', '#CC9900', '#CC8C00', '#CC8000', '#CC7300', '#CC6600', '#CC5900', '#CC4C00', '#CC4000', '#CC3300', '#CC2600', '#CC1A00', '#CC0D00', '#CC0000']; - -var nullColor = '#F5F8FA'; -var deadColor = '#B000CC'; - -// animation variables -var drawing = false; -var canvas = document.getElementById('visCanvas'); -var context = canvas.getContext('2d'); - -// mouse handling for server information display -document.getElementById('hoverable').addEventListener('mouseover', showId, false); -document.getElementById('hoverable').addEventListener('mousemove', showId, false); -document.getElementById('hoverable').addEventListener('mouseout', hideId, false); -document.getElementById('vishoverinfo').addEventListener('click', goToServer, false); -canvas.addEventListener('click', goToServer, false); - -// initialize settings based on request parameters -var main = document.getElementById('main'); -var speedStatType; -var colorStatType; -var speedDisabled = true; -var useCircles = true; -setShape(document.getElementById('shape')); -setSize(document.getElementById('size')); -setMotion(document.getElementById('motion')); -setColor(document.getElementById('color')); - -// xml loading variables -var xmlReturned = true; -var xmlhttp=new XMLHttpRequest(); // don't bother allowing for IE 5 or 6 since canvas won't work -xmlhttp.onreadystatechange=function() { - handleNewData(); -} -self.setInterval("getXML()",5000); -//self.setInterval("drawDots()",20); - -window.requestAnimFrame = (function(callback){ - return window.requestAnimationFrame || - window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.oRequestAnimationFrame || - window.msRequestAnimationFrame || - function(callback){ - window.setTimeout(callback, 1000 / 60); - }; -})(); - -function handleNewData() { - if (xmlhttp.readyState!=4) { - return; - } - if (xmlhttp.status!=200 || xmlhttp.responseText==null) { - xmlReturned = true; - return; - } - var newstats = eval('(' + xmlhttp.responseText + ')'); - for (var i in newstats.servers) { - for (var s in statNames) { - if (statNames[s]) - continue; - newstats.servers[i][s] = Math.max(0,Math.floor(significance[s]*newstats.servers[i][s])/significance[s]); - if (adjustMax[s]) - maxStatValues[s] = Math.max(newstats.servers[i][s],maxStatValues[s]); - } - } - - initDerivedInfo(newstats); - var oldstats = stats; - while(drawing) {} - stats = newstats; - delete oldstats; - xmlReturned = true; -} - -// set max and average -function setDerivedStats(serverStats) { - var avgStat = 0; - var maxStat = 0; - var maxIndex = 0; - for (var s in statNames) { - if (statNames[s]) - continue; - normStat = serverStats[s]/maxStatValues[s]; - if (normStat > 0) - avgStat += normStat; - if (maxStat < normStat) { - maxStat = normStat; - maxIndex = s; - } - } - serverStats.allmax = Math.floor(significance.allmax*Math.min(1,maxStat))/significance.allmax; - serverStats.allavg = Math.floor(significance.allavg*avgStat/numNormalStats)/significance.allavg; - serverStats.maxStat = maxIndex; -} - -function initDerivedInfo(newstats) { - for (var i in newstats.servers) { - if ('dead' in newstats.servers[i] || 'bad' in newstats.servers[i]) { - continue; - } - if (i >= dots.length) { - dots.push({'size': maxDotRadius, 'growing': false}); - } - setDerivedStats(newstats.servers[i]); - } -} - -// construct server info for hover -function getInfo(serverStats) { - var extra = '' + serverStats.ip + ''; - if ('dead' in serverStats || 'bad' in serverStats) - return extra; - extra = extra + ' (' + serverStats.hostname + ')'; - var j = 0; - for (var s in statNames) { - if (j % 4 == 0) - extra = extra + '
\n'; - extra = extra + '  ' + s + ': ' + serverStats[s] + ''; - j++; - } - extra = extra + ' (' + serverStats.maxStat + ')'; - return extra; -} - -// reload xml -function getXML() { - if (xmlReturned == true) { - xmlReturned = false; - xmlhttp.open('POST',jsonurl,true); - xmlhttp.send(); - } -} - -// redraw -function drawDots() { - requestAnimFrame(drawDots); - - var width = Math.ceil(Math.sqrt(stats.servers.length)); - var height = Math.ceil(stats.servers.length/width); - var x; - var y; - var server - var sizeChange; - drawing = true; - for (var i in stats.servers) { - server = stats.servers[i]; - x = i % width; - y = Math.floor(i / width); - if ('bad' in server || 'dead' in server) { - strokeDot(x,y,maxDotRadius-1,deadColor); - continue; - } - if (speedDisabled || Math.floor(dots[i].size) > maxDotRadius) { - // check for resize by the user - dots[i].size = maxDotRadius; - } else if (server[speedStatType]<=0) { - // if not changing size, increase to max radius - if (dots[i].size < maxDotRadius) - dots[i].size = dots[i].size + 1; - if (dots[i].size > maxDotRadius) - dots[i].size = maxDotRadius; - } else { - sizeChange = getStat(i,speedStatType); - if (dots[i].growing) { - dots[i].size = dots[i].size + sizeChange; - if (dots[i].size + sizeChange > maxDotRadius) { - dots[i].growing = false; - } - } - else { - dots[i].size = dots[i].size - sizeChange; - if (dots[i].size - sizeChange < minDotRadius) { - dots[i].growing = true; - } - } - } - drawDot(x,y,Math.floor(dots[i].size),getColor(getStat(i,colorStatType))); - } - // mousedDot shouldn't be set to an invalid dot, but stats might have changed since then - if (mousedDot >= 0 && mousedDot < stats.servers.length) - document.getElementById('vishoverinfo').innerHTML=getInfo(stats.servers[mousedDot]); - drawing = false; -} - -// fill in a few grey dots -function drawGrid() { - context.clearRect(0, 0, canvas.width, canvas.height); - for (var i=0, k=0; i < canvas.width; i+=dotSpacing*2,k++) { - for (var j=0, l=0; j < canvas.height; j+=dotSpacing*2,l++) { - drawDot(k,l,maxDotRadius,nullColor); - } - } -} - -// fill a dot specified by indices into dot grid -function drawDot(i,j,r,c) { - var x = i*dotSpacing*2 + dotSpacing; - var y = j*dotSpacing*2 + dotSpacing; - context.clearRect(x-dotSpacing, y-dotSpacing, dotSpacing*2, dotSpacing*2); - if (useCircles) - fillCircle(x,y,r-dotPadding,c); - else - fillSquare(x-r,y-r,(r-dotPadding)*2,c); -} - -// stroke a dot specified by indices into dot grid -function strokeDot(i,j,r,c) { - var x = i*dotSpacing*2 + dotSpacing; - var y = j*dotSpacing*2 + dotSpacing; - context.clearRect(x-dotSpacing, y-dotSpacing, dotSpacing*2, dotSpacing*2); - if (useCircles) - strokeCircle(x,y,r-dotPadding,c); - else - strokeSquare(x-r,y-r,(r-dotPadding)*2,c); -} - -function getStat(dotIndex,statIndex) { - return Math.min(1,stats.servers[dotIndex][statIndex]/maxStatValues[statIndex]); -} - -// translate color between 0 and maxObservedColor into an html color code -function getColor(normColor) { - return colorPalette[Math.round((colorPalette.length-1)*normColor)]; -} - -function strokeCircle(x,y,r,c) { - context.strokeStyle = c; - context.lineWidth = 2; - context.beginPath(); - context.arc(x,y,r,0,Math.PI*2,true); - context.closePath(); - context.stroke(); -} - -function fillCircle(x,y,r,c) { - context.fillStyle = c; - context.beginPath(); - context.arc(x,y,r,0,Math.PI*2,true); - context.closePath(); - context.fill(); -} - -function strokeSquare(x,y,d,c) { - context.strokeStyle = c; - context.lineWidth = 2; - context.strokeRect(x,y,d,d); -} - -function fillSquare(x,y,d,c) { - context.fillStyle = c; - context.fillRect(x,y,d,d); -} - -// callback for shape selection -function setShape(obj) { - switch (obj.selectedIndex) { - case 0: - useCircles = true; - break; - case 1: - useCircles = false; - break; - default: - useCircles = true; - } - drawGrid(); - setState(); -} - -// callback for size selection -function setSize(obj) { - switch (obj.selectedIndex) { - case 0: - dotSpacing = 5; - minDotRadius = 1; - break; - case 1: - dotSpacing = 10; - minDotRadius = 3; - break; - case 2: - dotSpacing = 20; - minDotRadius = 5; - break; - case 3: - dotSpacing = 40; - minDotRadius = 7; - break; - default: - dotSpacing = 10; - minDotRadius = 3; - } - maxDotRadius = dotSpacing - dotPadding; - drawGrid(); - setState(); -} - -// callback for motion selection -function setMotion(obj) { - if (obj.selectedIndex==0) { - speedDisabled = true; - setState(); - return; - } - var i = 1; - for (var s in statNames) { - if (i==obj.selectedIndex) { - speedStatType = s; - break; - } - i++; - } - speedDisabled = false; - setState(); -} - -// callback for color selection -function setColor(obj) { - var i = 0; - for (var s in statNames) { - if (i==obj.selectedIndex) { - colorStatType = s; - break; - } - i++; - } - setState(); -} - -// hide server info on mouseout -function hideId(e) { - document.getElementById('vishoverinfo').style.visibility='hidden'; -} - -// display server info on mouseover -function showId(e) { - var x; - var y; - if (e.pageX || e.pageY) { - x = e.pageX + main.scrollLeft; - y = e.pageY + main.scrollTop; - } - else { - // clientX and clientY unimplemented - return; - } - var relx = x - canvas.offsetLeft - main.offsetLeft; - var rely = y - canvas.offsetTop - main.offsetTop; - var width = Math.ceil(Math.sqrt(stats.servers.length)); - gotDot = Math.floor(relx/(dotSpacing*2)) + width*Math.floor(rely/(dotSpacing*2)); - mousedDot = -1; - if (relx < (width*dotSpacing*2) && gotDot >= 0 && gotDot < stats.servers.length) { - mousedDot = gotDot; - document.getElementById('vishoverinfo').style.left=relx+canvas.offsetLeft; - document.getElementById('vishoverinfo').style.top=Math.max(0,rely+canvas.offsetTop-70); - document.getElementById('vishoverinfo').style.visibility='visible'; - } - else { - document.getElementById('vishoverinfo').style.visibility='hidden'; - } -} - -function setState() { - var url = visurl+'?shape='+(useCircles?'circles':'squares')+'&size='+(dotSpacing*2)+(speedDisabled ? '' : '&motion='+speedStatType)+'&color='+colorStatType; - window.history.replaceState(window.history.state,'Server Activity',url); -} - -// go to server page on click -function goToServer(e) { - // mousedDot shouldn't be set to an invalid dot, but stats might have changed since then - if (mousedDot >= 0 && mousedDot < stats.servers.length) - window.location = serverurl + stats.servers[mousedDot].ip; -} - -window.onload = function() { - drawGrid(); - drawDots(); - getXML(); -} - http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/server/server/src/test/java/org/apache/accumulo/server/monitor/ShowTraceLinkTypeTest.java ---------------------------------------------------------------------- diff --git a/server/server/src/test/java/org/apache/accumulo/server/monitor/ShowTraceLinkTypeTest.java b/server/server/src/test/java/org/apache/accumulo/server/monitor/ShowTraceLinkTypeTest.java deleted file mode 100644 index 37ba361..0000000 --- a/server/server/src/test/java/org/apache/accumulo/server/monitor/ShowTraceLinkTypeTest.java +++ /dev/null @@ -1,62 +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. - */ -package org.apache.accumulo.server.monitor; - -import java.util.ArrayList; -import java.util.Collections; - -import org.apache.accumulo.trace.thrift.RemoteSpan; -import org.junit.Assert; -import org.junit.Test; - -public class ShowTraceLinkTypeTest { - - @Test - public void testTraceSortingForMonitor() { - /* public RemoteSpan(String sender, String svc, long traceId, long spanId, - long parentId, long start, long stop, String description, Map data) */ - ArrayList spans = new ArrayList(10), expectedOrdering = new ArrayList(10); - - // "Random" ordering - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 55l, 75l, "desc5", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 25l, 30l, "desc2", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 85l, 90l, "desc8", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 45l, 60l, "desc4", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 35l, 55l, "desc3", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 95l, 110l, "desc9", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 65l, 80l, "desc6", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 100l, 120l, "desc10", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 15l, 25l, "desc1", Collections. emptyMap())); - spans.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 75l, 100l, "desc7", Collections. emptyMap())); - - // We expect them to be sorted by 'start' - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 15l, 25l, "desc1", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 25l, 30l, "desc2", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 35l, 55l, "desc3", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 45l, 60l, "desc4", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 55l, 75l, "desc5", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 65l, 80l, "desc6", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 75l, 100l, "desc7", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 85l, 90l, "desc8", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 95l, 110l, "desc9", Collections. emptyMap())); - expectedOrdering.add(new RemoteSpan("sender", "svc", 0l, 0l, 0l, 100l, 120l, "desc10", Collections. emptyMap())); - - Collections.sort(spans); - - Assert.assertEquals(expectedOrdering, spans); - } -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/server/server/src/test/java/org/apache/accumulo/server/monitor/ZooKeeperStatusTest.java ---------------------------------------------------------------------- diff --git a/server/server/src/test/java/org/apache/accumulo/server/monitor/ZooKeeperStatusTest.java b/server/server/src/test/java/org/apache/accumulo/server/monitor/ZooKeeperStatusTest.java deleted file mode 100644 index d304aed..0000000 --- a/server/server/src/test/java/org/apache/accumulo/server/monitor/ZooKeeperStatusTest.java +++ /dev/null @@ -1,56 +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. - */ -package org.apache.accumulo.server.monitor; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.TreeSet; - -import org.apache.accumulo.server.monitor.ZooKeeperStatus.ZooKeeperState; -import org.junit.Assert; -import org.junit.Test; - -public class ZooKeeperStatusTest { - - @Test - public void zkHostSortingTest() { - List expectedHosts = Arrays.asList("rack1node1", "rack2node1", "rack4node1", "rack4node4"); - - // Add the states in a not correctly sorted order - TreeSet states = new TreeSet(); - states.add(new ZooKeeperState("rack4node4", "leader", 10)); - states.add(new ZooKeeperState("rack4node1", "follower", 10)); - states.add(new ZooKeeperState("rack1node1", "follower", 10)); - states.add(new ZooKeeperState("rack2node1", "follower", 10)); - - List actualHosts = new ArrayList(4); - for (ZooKeeperState state : states) { - actualHosts.add(state.keeper); - } - - // Assert we have 4 of each - Assert.assertEquals(expectedHosts.size(), actualHosts.size()); - - // Assert the ordering is correct - for (int i = 0; i < expectedHosts.size(); i++) { - Assert.assertEquals(expectedHosts.get(i), actualHosts.get(i)); - } - - } - -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/start/src/main/java/org/apache/accumulo/start/Main.java ---------------------------------------------------------------------- diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java b/start/src/main/java/org/apache/accumulo/start/Main.java index 66a3e71..8a3acf4 100644 --- a/start/src/main/java/org/apache/accumulo/start/Main.java +++ b/start/src/main/java/org/apache/accumulo/start/Main.java @@ -55,9 +55,9 @@ public class Main { } else if (args[0].equals("admin")) { runTMP = cl.loadClass("org.apache.accumulo.server.util.Admin"); } else if (args[0].equals("gc")) { - runTMP = cl.loadClass("org.apache.accumulo.server.gc.SimpleGarbageCollector"); + runTMP = cl.loadClass("org.apache.accumulo.gc.SimpleGarbageCollector"); } else if (args[0].equals("monitor")) { - runTMP = cl.loadClass("org.apache.accumulo.server.monitor.Monitor"); + runTMP = cl.loadClass("org.apache.accumulo.monitor.Monitor"); } else if (args[0].equals("tracer")) { runTMP = cl.loadClass("org.apache.accumulo.server.trace.TraceServer"); } else if (args[0].equals("proxy")) { @@ -100,6 +100,7 @@ public class Main { final Object thisIsJustOneArgument = argsToPass; final Method finalMain = main; r = new Runnable() { + @Override public void run() { try { finalMain.invoke(null, thisIsJustOneArgument); @@ -121,6 +122,7 @@ public class Main { } private static void printUsage() { - System.out.println("accumulo init | master | tserver | monitor | shell | admin | gc | classpath | rfile-info | login-info | tracer | minicluster | proxy | zookeeper | create-token | args"); + System.out + .println("accumulo init | master | tserver | monitor | shell | admin | gc | classpath | rfile-info | login-info | tracer | minicluster | proxy | zookeeper | create-token | args"); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java b/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java index 46b9914..a2337dc 100644 --- a/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java +++ b/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java @@ -25,8 +25,8 @@ import org.apache.accumulo.core.master.thrift.MasterMonitorInfo; import org.apache.accumulo.core.master.thrift.RecoveryStatus; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; +import org.apache.accumulo.monitor.Monitor; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.monitor.Monitor; import org.apache.accumulo.server.security.SystemCredentials; import org.apache.accumulo.trace.instrument.Tracer; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java index 8a22e99..006b0f7 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java @@ -40,11 +40,11 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.Stat; +import org.apache.accumulo.monitor.Monitor; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.cli.ClientOnRequiredTable; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.fs.VolumeManagerImpl; -import org.apache.accumulo.server.monitor.Monitor; import org.apache.accumulo.server.security.SystemCredentials; import org.apache.accumulo.trace.instrument.Tracer; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index 217b978..29c4cfd 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -37,11 +37,11 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.gc.SimpleGarbageCollector; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.MiniAccumuloConfig; import org.apache.accumulo.minicluster.ProcessReference; import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.server.gc.SimpleGarbageCollector; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.hadoop.fs.FileStatus; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c67460ee/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java index 8cad540..a5dfc5b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -47,7 +47,7 @@ import org.apache.accumulo.core.file.rfile.PrintInfo; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.server.monitor.Monitor; +import org.apache.accumulo.monitor.Monitor; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestMultiTableIngest;