svn commit: r1451515 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/tokens/
Author: ctubbsii Date: Fri Mar 1 08:09:35 2013 New Revision: 1451515 URL: http://svn.apache.org/r1451515 Log: ACCUMULO-1133 Finish incomplete move of tokens. Removed: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/tokens/
svn commit: r1451607 - /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
Author: ecn Date: Fri Mar 1 14:53:37 2013 New Revision: 1451607 URL: http://svn.apache.org/r1451607 Log: ACCUMULO-259 fix randomwalk test... again Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java?rev=1451607r1=1451606r2=1451607view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java Fri Mar 1 14:53:37 2013 @@ -95,7 +95,7 @@ public class State { public Connector getConnector() throws AccumuloException, AccumuloSecurityException { if (connector == null) { - connector = getInstance().getConnector(getCredentials().getPrincipal(), getCredentials().getToken()); + connector = getInstance().getConnector(getCredentials()); } return connector; }
svn commit: r1451647 - in /accumulo/trunk: ./ assemble/ bin/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
Author: ecn Date: Fri Mar 1 16:54:02 2013 New Revision: 1451647 URL: http://svn.apache.org/r1451647 Log: ACCUMULO-1071 committing Damon Brown's patch to clean-up the shell scripts Added: accumulo/trunk/bin/bootstrap_config.sh (with props) Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/bin/LogForwarder.sh accumulo/trunk/bin/accumulo accumulo/trunk/bin/bootstrap_hdfs.sh accumulo/trunk/bin/config.sh accumulo/trunk/bin/etc_initd_accumulo accumulo/trunk/bin/generate_monitor_certificate.sh accumulo/trunk/bin/start-all.sh accumulo/trunk/bin/start-here.sh accumulo/trunk/bin/start-server.sh accumulo/trunk/bin/stop-all.sh accumulo/trunk/bin/stop-here.sh accumulo/trunk/bin/stop-server.sh accumulo/trunk/bin/tdown.sh accumulo/trunk/bin/tool.sh accumulo/trunk/bin/tup.sh accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451640 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1451640 Modified: accumulo/trunk/bin/LogForwarder.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/LogForwarder.sh?rev=1451647r1=1451646r2=1451647view=diff == --- accumulo/trunk/bin/LogForwarder.sh (original) +++ accumulo/trunk/bin/LogForwarder.sh Fri Mar 1 16:54:02 2013 @@ -33,6 +33,18 @@ # # LogForwarder.sh -h 127.0.0.1 -p 4448 -f tserver* -s 201001011 -e 20100101235959 -l INFO -m .*scan.* # -. accumulo-config.sh -java -cp $ACCUMULO_HOME/lib org.apache.accumulo.server.util.SendLogToChainsaw -d $ACCUMULO_LOG_DIR $@ +# Start: Resolve Script Directory +SOURCE=${BASH_SOURCE[0]} +while [ -h $SOURCE ]; do # resolve $SOURCE until the file is no longer a symlink + bin=$( cd -P $( dirname $SOURCE ) pwd ) + SOURCE=$(readlink $SOURCE) + [[ $SOURCE != /* ]] SOURCE=$bin/$SOURCE # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin=$( cd -P $( dirname $SOURCE ) pwd ) +script=$( basename $SOURCE ) +# Stop: Resolve Script Directory + +. $bin/config.sh + +${JAVA_HOME}/bin/java -cp $ACCUMULO_HOME/lib org.apache.accumulo.server.util.SendLogToChainsaw -d $ACCUMULO_LOG_DIR $@ Modified: accumulo/trunk/bin/accumulo URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1451647r1=1451646r2=1451647view=diff == --- accumulo/trunk/bin/accumulo (original) +++ accumulo/trunk/bin/accumulo Fri Mar 1 16:54:02 2013 @@ -15,116 +15,107 @@ # See the License for the specific language governing permissions and # limitations under the License. -_readlink () -{ - result=`readlink -f $1 2/dev/null` - if [ $? -eq 0 ]; - then -echo $result -return 0 - fi - - oldPath=$1 - if [ -n `echo $oldPath | egrep ^[.]` ]; then -oldPath=`echo $1 | sed -e 's#[.]/##'` - fi - if [ -z `echo $oldPath | egrep '^/'` ]; then -oldPath=`pwd`/$oldPath - fi - newPath=$oldPath - while [ $newPath ]; - do -oldPath=$newPath -newPath=`readlink $newPath` - done - - echo $oldPath - return 0 -} - -bin=`_readlink $0` -bin=`dirname $bin` -bin=`cd $bin; pwd` +# Start: Resolve Script Directory +SOURCE=${BASH_SOURCE[0]} +while [ -h $SOURCE ]; do # resolve $SOURCE until the file is no longer a symlink + bin=$( cd -P $( dirname $SOURCE ) pwd ) + SOURCE=$(readlink $SOURCE) + [[ $SOURCE != /* ]] SOURCE=$bin/$SOURCE # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +bin=$( cd -P $( dirname $SOURCE ) pwd ) +script=$( basename $SOURCE ) +# Stop: Resolve Script Directory . $bin/config.sh START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar +# +# Resolve a program to its installation directory +# locationByProgram() { - # find the program - RESULT=`which $1 2/dev/null` - if test ! -z $RESULT - then - # strip the program name from the path - RESULT=`dirname ${RESULT}` - # strip /bin from the path - RESULT=`dirname ${RESULT}` - echo ${RESULT} + RESULT=$( which $1 ) + if [[ $? != 0 -z $RESULT ]]; then + echo Cannot find '$1' and '$2' is not set in conf/accumulo-env.sh + exit 1 fi + while [ -h $RESULT ]; do # resolve $RESULT
svn commit: r1451648 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/security/tokens/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org
Author: kturner Date: Fri Mar 1 16:56:04 2013 New Revision: 1451648 URL: http://svn.apache.org/r1451648 Log: ACCUMULO-1133 Finish incomplete move of tokens ACCUMULO-1137 Set 'accumulo' namespace for c++ bindings Removed: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/tokens/ Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/proxy/src/main/thrift/proxy.thrift accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451427-1451516 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1451410-1451516 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1451427-1451516 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1451427-1451516 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451410-1451516 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451410-1451516 Modified: accumulo/trunk/proxy/src/main/thrift/proxy.thrift URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/thrift/proxy.thrift?rev=1451648r1=1451647r2=1451648view=diff == --- accumulo/trunk/proxy/src/main/thrift/proxy.thrift (original) +++ accumulo/trunk/proxy/src/main/thrift/proxy.thrift Fri Mar 1 16:56:04 2013 @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +namespace cpp accumulo namespace java org.apache.accumulo.proxy.thrift struct Key { Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1451427-1451516 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.5/src:r1451410-1451516
svn commit: r1451664 - /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
Author: ecn Date: Fri Mar 1 17:45:41 2013 New Revision: 1451664 URL: http://svn.apache.org/r1451664 Log: ACCUMULO-1115 handle table deleted exception Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java?rev=1451664r1=1451663r2=1451664view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java Fri Mar 1 17:45:41 2013 @@ -19,6 +19,9 @@ package org.apache.accumulo.test.randomw import java.util.Properties; import java.util.SortedSet; +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; +import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -140,7 +143,16 @@ public class Config extends Test { long newValue = random.nextLong(setting.min, setting.max); state.getMap().put(LAST_TABLE_SETTING, table + , + choice); log.debug(Setting + setting.property.getKey() + on table + table + to + newValue); -state.getConnector().tableOperations().setProperty(table, setting.property.getKey(), + newValue); +try { + state.getConnector().tableOperations().setProperty(table, setting.property.getKey(), + newValue); +} catch (AccumuloException ex) { + if (ex.getCause() instanceof ThriftTableOperationException) { +ThriftTableOperationException ttoe = (ThriftTableOperationException)ex.getCause(); +if (ttoe.type == TableOperationExceptionType.NOTFOUND) + return; + } + throw ex; +} } private void changeSetting(RandomData random, State state, Properties props) throws Exception {
svn commit: r1451667 - /accumulo/branches/1.5/bin/start-server.sh
Author: ecn Date: Fri Mar 1 17:53:40 2013 New Revision: 1451667 URL: http://svn.apache.org/r1451667 Log: ACCUMULO-1071 fixing syntax error Modified: accumulo/branches/1.5/bin/start-server.sh Modified: accumulo/branches/1.5/bin/start-server.sh URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/start-server.sh?rev=1451667r1=1451666r2=1451667view=diff == --- accumulo/branches/1.5/bin/start-server.sh (original) +++ accumulo/branches/1.5/bin/start-server.sh Fri Mar 1 17:53:40 2013 @@ -28,7 +28,7 @@ bin=$( cd -P $( dirname $SOURCE ) . $bin/config.sh HOST=$1 -host $1 /dev/null 2/dev/null +host $1 /dev/null 2/dev/null if [ $? -ne 0 ]; then LOGHOST=$1 else
svn commit: r1451692 - /accumulo/branches/1.5/bin/bootstrap_config.sh
Author: vines Date: Fri Mar 1 19:28:48 2013 New Revision: 1451692 URL: http://svn.apache.org/r1451692 Log: ACCUMULO-1071 - needs to be executable Modified: accumulo/branches/1.5/bin/bootstrap_config.sh (props changed) Propchange: accumulo/branches/1.5/bin/bootstrap_config.sh -- svn:executable = *
svn commit: r1451693 - in /accumulo/trunk: ./ bin/bootstrap_config.sh
Author: vines Date: Fri Mar 1 19:29:13 2013 New Revision: 1451693 URL: http://svn.apache.org/r1451693 Log: ACCUMULO-1071 - needs to be executable Modified: accumulo/trunk/ (props changed) accumulo/trunk/bin/bootstrap_config.sh (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451692 Propchange: accumulo/trunk/bin/bootstrap_config.sh -- svn:executable = *
svn commit: r1451700 - /accumulo/branches/1.4/docs/src/user_manual/chapters/table_configuration.tex
Author: ecn Date: Fri Mar 1 20:03:27 2013 New Revision: 1451700 URL: http://svn.apache.org/r1451700 Log: ACCUMULO-1038 commiting patch provided by Michael Berman Modified: accumulo/branches/1.4/docs/src/user_manual/chapters/table_configuration.tex Modified: accumulo/branches/1.4/docs/src/user_manual/chapters/table_configuration.tex URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/docs/src/user_manual/chapters/table_configuration.tex?rev=1451700r1=1451699r2=1451700view=diff == --- accumulo/branches/1.4/docs/src/user_manual/chapters/table_configuration.tex (original) +++ accumulo/branches/1.4/docs/src/user_manual/chapters/table_configuration.tex Fri Mar 1 20:03:27 2013 @@ -163,8 +163,8 @@ user@myinstance mytable setiter -t myta \begin{verbatim} scanner.addIterator(new IteratorSetting( 15, // priority -com.company.MyIterator, // class name -myiter // name this iterator +myiter, // name this iterator +com.company.MyIterator // class name )); \end{verbatim} \normalsize
svn commit: r1451701 - in /accumulo/branches/1.5: ./ assemble/ core/ docs/src/user_manual/chapters/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/
Author: ecn Date: Fri Mar 1 20:05:32 2013 New Revision: 1451701 URL: http://svn.apache.org/r1451701 Log: ACCUMULO-1038 commiting patch provided by Michael Berman Modified: accumulo/branches/1.5/ (props changed) accumulo/branches/1.5/assemble/ (props changed) accumulo/branches/1.5/core/ (props changed) accumulo/branches/1.5/docs/src/user_manual/chapters/table_configuration.tex accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/1.5/server/ (props changed) accumulo/branches/1.5/src/ (props changed) Propchange: accumulo/branches/1.5/ -- Merged /accumulo/branches/1.4:r1451700 Propchange: accumulo/branches/1.5/assemble/ -- Merged /accumulo/branches/1.4/assemble:r1451700 Propchange: accumulo/branches/1.5/core/ -- Merged /accumulo/branches/1.4/core:r1451700 Modified: accumulo/branches/1.5/docs/src/user_manual/chapters/table_configuration.tex URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/user_manual/chapters/table_configuration.tex?rev=1451701r1=1451700r2=1451701view=diff == --- accumulo/branches/1.5/docs/src/user_manual/chapters/table_configuration.tex (original) +++ accumulo/branches/1.5/docs/src/user_manual/chapters/table_configuration.tex Fri Mar 1 20:05:32 2013 @@ -161,8 +161,8 @@ user@myinstance mytable setiter -t myta \begin{verbatim} scanner.addIterator(new IteratorSetting( 15, // priority -com.company.MyIterator, // class name -myiter // name this iterator +myiter, // name this iterator +com.company.MyIterator // class name )); \end{verbatim} \normalsize Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451700 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451700 Propchange: accumulo/branches/1.5/server/ -- Merged /accumulo/branches/1.4/server:r1451700 Propchange: accumulo/branches/1.5/src/ -- Merged /accumulo/branches/1.4/src:r1451700
svn commit: r1451703 - in /accumulo/trunk: ./ assemble/ core/ docs/src/user_manual/chapters/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeepe
Author: ecn Date: Fri Mar 1 20:06:30 2013 New Revision: 1451703 URL: http://svn.apache.org/r1451703 Log: ACCUMULO-1038 commiting patch provided by Michael Berman Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451700-1451701 Merged /accumulo/branches/1.4:r1451700 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.4/assemble:r1451700 Merged /accumulo/branches/1.5/assemble:r1451700-1451701 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1451700-1451701 Merged /accumulo/branches/1.4/core:r1451700 Modified: accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex?rev=1451703r1=1451702r2=1451703view=diff == --- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex (original) +++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Fri Mar 1 20:06:30 2013 @@ -161,8 +161,8 @@ user@myinstance mytable setiter -t myta \begin{verbatim} scanner.addIterator(new IteratorSetting( 15, // priority -com.company.MyIterator, // class name -myiter // name this iterator +myiter, // name this iterator +com.company.MyIterator // class name )); \end{verbatim} \normalsize Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1451700-1451701 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451700-1451701 Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451700 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451700-1451701 Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451700 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.4/server:r1451700 Merged /accumulo/branches/1.5/server:r1451700-1451701 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.4/src:r1451700 Merged /accumulo/branches/1.5/src:r1451700-1451701
svn commit: r1451707 - /accumulo/site/trunk/content/people.mdtext
Author: ecn Date: Fri Mar 1 20:15:53 2013 New Revision: 1451707 URL: http://svn.apache.org/r1451707 Log: Added Michael Berman for ACCUMULO-1038 Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1451707r1=1451706r2=1451707view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Fri Mar 1 20:15:53 2013 @@ -83,12 +83,13 @@ Contributors tr class=eventd/tdtdLuke Brassard/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr tr class=oddtd/tdtdMatthew Kirkley/tdtd/tdtd/td/tr tr class=eventd/tdtdMichael Allen/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtd/tdtdMichael Wall/tdtd/tdtd/td/tr - tr class=eventd/tdtdOren Falkowitz/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtd/tdtdPhil Eberhardt/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdPhilip Young/tdtd/tdtd/td/tr - tr class=oddtd/tdtdSapah Shah/tdtd/tdtd/td/tr - tr class=eventd/tdtdScott Kuehn/tdtd/tdtd/td/tr - tr class=oddtd/tdtdTim Halloran/tdtd/tdtd/td/tr - tr class=eventd/tdtdTravis Pinney/tdtd/tdtd/td/tr + tr class=oddtd/tdtdMichael Berman/tdtd/tdtd/td/tr + tr class=eventd/tdtdMichael Wall/tdtd/tdtd/td/tr + tr class=oddtd/tdtdOren Falkowitz/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=eventd/tdtdPhil Eberhardt/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=oddtd/tdtdPhilip Young/tdtd/tdtd/td/tr + tr class=eventd/tdtdSapah Shah/tdtd/tdtd/td/tr + tr class=oddtd/tdtdScott Kuehn/tdtd/tdtd/td/tr + tr class=eventd/tdtdTim Halloran/tdtd/tdtd/td/tr + tr class=oddtd/tdtdTravis Pinney/tdtd/tdtd/td/tr /table \ No newline at end of file
svn commit: r852608 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot Date: Fri Mar 1 20:16:03 2013 New Revision: 852608 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Mar 1 20:16:03 2013 @@ -1 +1 @@ -1451455 +1451707 Modified: websites/staging/accumulo/trunk/content/people.html == --- websites/staging/accumulo/trunk/content/people.html (original) +++ websites/staging/accumulo/trunk/content/people.html Fri Mar 1 20:16:03 2013 @@ -151,14 +151,15 @@ tr.even { tr class=eventd/tdtdLuke Brassard/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr tr class=oddtd/tdtdMatthew Kirkley/tdtd/tdtd/td/tr tr class=eventd/tdtdMichael Allen/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtd/tdtdMichael Wall/tdtd/tdtd/td/tr - tr class=eventd/tdtdOren Falkowitz/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=oddtd/tdtdPhil Eberhardt/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr - tr class=eventd/tdtdPhilip Young/tdtd/tdtd/td/tr - tr class=oddtd/tdtdSapah Shah/tdtd/tdtd/td/tr - tr class=eventd/tdtdScott Kuehn/tdtd/tdtd/td/tr - tr class=oddtd/tdtdTim Halloran/tdtd/tdtd/td/tr - tr class=eventd/tdtdTravis Pinney/tdtd/tdtd/td/tr + tr class=oddtd/tdtdMichael Berman/tdtd/tdtd/td/tr + tr class=eventd/tdtdMichael Wall/tdtd/tdtd/td/tr + tr class=oddtd/tdtdOren Falkowitz/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=eventd/tdtdPhil Eberhardt/tdtda href=http://sqrrl.com/sqrrl/a/tdtdET (a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html-5/a / a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html-4/a)/td/tr + tr class=oddtd/tdtdPhilip Young/tdtd/tdtd/td/tr + tr class=eventd/tdtdSapah Shah/tdtd/tdtd/td/tr + tr class=oddtd/tdtdScott Kuehn/tdtd/tdtd/td/tr + tr class=eventd/tdtdTim Halloran/tdtd/tdtd/td/tr + tr class=oddtd/tdtdTravis Pinney/tdtd/tdtd/td/tr /table /div
svn commit: r852609 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: ecn Date: Fri Mar 1 20:16:37 2013 New Revision: 852609 Log: Publishing svnmucc operation to accumulo site by ecn Added: websites/production/accumulo/content/ - copied from r852608, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r852608, websites/production/accumulo/content/1.4/apidocs/
svn commit: r1451716 - in /accumulo/trunk: ./ server/ server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
Author: vines Date: Fri Mar 1 21:04:13 2013 New Revision: 1451716 URL: http://svn.apache.org/r1451716 Log: ACCUMULO-1131 - improved method of sending back token location class Modified: accumulo/trunk/ (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451693-1451699,1451702-1451715 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451715 Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java?rev=1451716r1=1451715r2=1451716view=diff == --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java Fri Mar 1 21:04:13 2013 @@ -77,7 +77,7 @@ public class InsecureAuthenticator exten @Override public String getTokenLoginClass() { -return org.apache.accumulo.core.security.handler.InsecureAuthenticator.class.getName(); +return super.getClass().getName(); } @Override
svn commit: r1451717 - in /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler: ZKAuthenticator.java ZKPermHandler.java
Author: vines Date: Fri Mar 1 21:05:17 2013 New Revision: 1451717 URL: http://svn.apache.org/r1451717 Log: ACCUMULO-1138 - syncing before uncached calls and ZKAuthenticator was kicking back the wrong class in getTokenLoginClass Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java?rev=1451717r1=1451716r2=1451717view=diff == --- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java (original) +++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java Fri Mar 1 21:05:17 2013 @@ -200,7 +200,7 @@ public final class ZKAuthenticator exten @Override public String getTokenLoginClass() { -return this.getClass().getCanonicalName(); +return super.getClass().getCanonicalName(); } @Override Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java?rev=1451717r1=1451716r2=1451717view=diff == --- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java (original) +++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java Fri Mar 1 21:05:17 2013 @@ -69,7 +69,9 @@ public class ZKPermHandler implements Pe public boolean hasTablePermission(String user, String table, TablePermission permission) { byte[] serializedPerms; try { - serializedPerms = ZooReaderWriter.getRetryingInstance().getData(ZKUserPath + / + user + ZKUserTablePerms + / + table, null); + String path = ZKUserPath + / + user + ZKUserTablePerms + / + table; + ZooReaderWriter.getRetryingInstance().sync(path); + serializedPerms = ZooReaderWriter.getRetryingInstance().getData(path, null); } catch (KeeperException e) { if (e.code() == Code.NONODE) { return false; @@ -306,7 +308,9 @@ public class ZKPermHandler implements Pe public boolean hasSystemPermission(String user, SystemPermission permission) throws AccumuloSecurityException { byte[] perms; try { - perms = ZooReaderWriter.getRetryingInstance().getData(ZKUserPath + / + user + ZKUserSysPerms, null); + String path = ZKUserPath + / + user + ZKUserSysPerms; + ZooReaderWriter.getRetryingInstance().sync(path); + perms = ZooReaderWriter.getRetryingInstance().getData(path, null); } catch (KeeperException e) { if (e.code() == Code.NONODE) { return false;
svn commit: r1451718 - in /accumulo/trunk: ./ server/ server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java server/src/main/java/org/apache/accumulo/server/security/han
Author: vines Date: Fri Mar 1 21:05:59 2013 New Revision: 1451718 URL: http://svn.apache.org/r1451718 Log: ACCUMULO-1138 - syncing before uncached calls and ZKAuthenticator was kicking back the wrong class in getTokenLoginClass Modified: accumulo/trunk/ (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451716-1451717 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1451716-1451717 Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java?rev=1451718r1=1451717r2=1451718view=diff == --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java Fri Mar 1 21:05:59 2013 @@ -200,7 +200,7 @@ public final class ZKAuthenticator exten @Override public String getTokenLoginClass() { -return this.getClass().getCanonicalName(); +return super.getClass().getCanonicalName(); } @Override Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java?rev=1451718r1=1451717r2=1451718view=diff == --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java Fri Mar 1 21:05:59 2013 @@ -69,7 +69,9 @@ public class ZKPermHandler implements Pe public boolean hasTablePermission(String user, String table, TablePermission permission) { byte[] serializedPerms; try { - serializedPerms = ZooReaderWriter.getRetryingInstance().getData(ZKUserPath + / + user + ZKUserTablePerms + / + table, null); + String path = ZKUserPath + / + user + ZKUserTablePerms + / + table; + ZooReaderWriter.getRetryingInstance().sync(path); + serializedPerms = ZooReaderWriter.getRetryingInstance().getData(path, null); } catch (KeeperException e) { if (e.code() == Code.NONODE) { return false; @@ -306,7 +308,9 @@ public class ZKPermHandler implements Pe public boolean hasSystemPermission(String user, SystemPermission permission) throws AccumuloSecurityException { byte[] perms; try { - perms = ZooReaderWriter.getRetryingInstance().getData(ZKUserPath + / + user + ZKUserSysPerms, null); + String path = ZKUserPath + / + user + ZKUserSysPerms; + ZooReaderWriter.getRetryingInstance().sync(path); + perms = ZooReaderWriter.getRetryingInstance().getData(path, null); } catch (KeeperException e) { if (e.code() == Code.NONODE) { return false;
svn commit: r1451762 - in /accumulo/branches/1.5: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/ma
Author: billie Date: Fri Mar 1 23:13:21 2013 New Revision: 1451762 URL: http://svn.apache.org/r1451762 Log: ACCUMULO-1127 merged disabling of dot motion to 1.5 branch Modified: accumulo/branches/1.5/ (props changed) accumulo/branches/1.5/assemble/ (props changed) accumulo/branches/1.5/core/ (props changed) accumulo/branches/1.5/examples/ (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/1.5/server/ (props changed) accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java accumulo/branches/1.5/server/src/main/resources/web/vis.js accumulo/branches/1.5/src/ (props changed) Propchange: accumulo/branches/1.5/ -- Merged /accumulo/trunk:r1451208 Propchange: accumulo/branches/1.5/assemble/ -- Merged /accumulo/trunk/assemble:r1451208 Propchange: accumulo/branches/1.5/core/ -- Merged /accumulo/trunk/core:r1451208 Propchange: accumulo/branches/1.5/examples/ -- Merged /accumulo/trunk/examples:r1451208 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451208 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451208 Propchange: accumulo/branches/1.5/server/ -- Merged /accumulo/trunk/server:r1451208 Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java?rev=1451762r1=1451761r2=1451762view=diff == --- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java (original) +++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java Fri Mar 1 23:13:21 2013 @@ -176,7 +176,8 @@ public class VisServlet extends BasicSer .append(80/option/select/span\n); // motion select box sb.append(nbsp;nbspspan class='viscontrol'Motion: select id='motion' onchange='setMotion(this)'); -addOptions(sb, cfg.motion); +sb.append(option selected='true'/option); +addOptions(sb, null); sb.append(/select/span\n); // color select box sb.append(nbsp;nbspspan class='viscontrol'Color: select id='color' onchange='setColor(this)'); Modified: accumulo/branches/1.5/server/src/main/resources/web/vis.js URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/resources/web/vis.js?rev=1451762r1=1451761r2=1451762view=diff == --- accumulo/branches/1.5/server/src/main/resources/web/vis.js (original) +++ accumulo/branches/1.5/server/src/main/resources/web/vis.js Fri Mar 1 23:13:21 2013 @@ -47,6 +47,7 @@ canvas.addEventListener('click', goToSer var main = document.getElementById('main'); var speedStatType; var colorStatType; +var speedDisabled = true; var useCircles = true; setShape(document.getElementById('shape')); setSize(document.getElementById('size')); @@ -178,7 +179,7 @@ function drawDots() { strokeDot(x,y,maxDotRadius-1,deadColor); continue; } -if (Math.floor(dots[i].size) maxDotRadius) { +if (speedDisabled || Math.floor(dots[i].size) maxDotRadius) { // check for resize by the user dots[i].size = maxDotRadius; } else if (server[speedStatType]=0) { @@ -325,7 +326,12 @@ function setSize(obj) { // callback for motion selection function setMotion(obj) { - var i = 0; + if (obj.selectedIndex==0) { +speedDisabled = true; +setState(); +return; + } + var i = 1; for (var s in statNames) { if (i==obj.selectedIndex) { speedStatType = s; @@ -333,6 +339,7 @@ function setMotion(obj) { } i++; } + speedDisabled = false; setState(); } @@ -383,7 +390,7 @@ function showId(e) { } function setState() { - var url =
svn commit: r1451763 - in /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security: ChangePass.java TableOp.java WalkingSecurity.java
Author: vines Date: Fri Mar 1 23:16:41 2013 New Revision: 1451763 URL: http://svn.apache.org/r1451763 Log: ACCUMULO-1123 - Had compensation for propogation times for uncached permissions. Authorizations and passwords didn't have the luxury. Added in transient state for authorizations and a pause for ChangePass to help compensate. Ideally, there would be compensation throughout the code for the password, but the code has already become a bit of a rats nest. WalkingSecurity helped clean it up tremendously, I should rewrite a lot of the states now that that exists to make it simpler. Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java?rev=1451763r1=1451762r2=1451763view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java Fri Mar 1 23:16:41 2013 @@ -81,6 +81,8 @@ public class ChangePass extends Test { } } WalkingSecurity.get(state).changePassword(target, newPass); +// Waiting 1 second for password to propogate through Zk +Thread.sleep(1000); if (!hasPerm) throw new AccumuloException(Password change succeeded when it should have failed for + source + changing the password for + target + .); } Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java?rev=1451763r1=1451762r2=1451763view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java Fri Mar 1 23:16:41 2013 @@ -72,6 +72,7 @@ public class TableOp extends Test { boolean canRead = WalkingSecurity.get(state).canScan(WalkingSecurity.get(state).getTabCredentials(), tableName); Authorizations auths = WalkingSecurity.get(state).getUserAuthorizations(WalkingSecurity.get(state).getTabCredentials()); boolean ambiguousZone = WalkingSecurity.get(state).inAmbiguousZone(conn.whoami(), tp); +boolean ambiguousAuths = WalkingSecurity.get(state).ambiguousAuthorizations(); try { Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(conn.whoami())); @@ -81,7 +82,7 @@ public class TableOp extends Test { EntryKey,Value entry = iter.next(); Key k = entry.getKey(); seen++; -if (!auths.contains(k.getColumnVisibilityData())) +if (!auths.contains(k.getColumnVisibilityData()) !ambiguousAuths) throw new AccumuloException(Got data I should not be capable of seeing: + k + table + tableName); } if (!canRead !ambiguousZone) @@ -90,7 +91,7 @@ public class TableOp extends Test { if (auths.contains(entry.getKey().getBytes())) seen = seen - entry.getValue(); } - if (seen != 0) + if (seen != 0 !ambiguousAuths) throw new AccumuloException(Got mismatched amounts of data); } catch (TableNotFoundException tnfe) { if (tableExists) @@ -103,6 +104,12 @@ public class TableOp extends Test { else return; } + if (ae.getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) { +if (ambiguousAuths) + return; +else + throw new AccumuloException(Mismatched authorizations! , ae); + } throw new AccumuloException(Unexpected exception!, ae); } catch (RuntimeException re) { if (re.getCause() instanceof AccumuloSecurityException @@ -112,6 +119,14 @@ public class TableOp extends Test { else return; } + if (re.getCause() instanceof AccumuloSecurityException + ((AccumuloSecurityException) re.getCause()).getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) { +if (ambiguousAuths) + return; +else +
svn commit: r1451764 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
Author: billie Date: Fri Mar 1 23:16:44 2013 New Revision: 1451764 URL: http://svn.apache.org/r1451764 Log: ACCUMULO-1127 merged mergeinfo to trunk Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451762 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1451762 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1451762 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1451762 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451762 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451762 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1451762 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.5/src:r1451762
svn commit: r1451768 - in /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security: TableOp.java WalkingSecurity.java
Author: vines Date: Fri Mar 1 23:25:01 2013 New Revision: 1451768 URL: http://svn.apache.org/r1451768 Log: ACCUMULO-1123 - minor oversight Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java?rev=1451768r1=1451767r2=1451768view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java Fri Mar 1 23:25:01 2013 @@ -72,7 +72,7 @@ public class TableOp extends Test { boolean canRead = WalkingSecurity.get(state).canScan(WalkingSecurity.get(state).getTabCredentials(), tableName); Authorizations auths = WalkingSecurity.get(state).getUserAuthorizations(WalkingSecurity.get(state).getTabCredentials()); boolean ambiguousZone = WalkingSecurity.get(state).inAmbiguousZone(conn.whoami(), tp); -boolean ambiguousAuths = WalkingSecurity.get(state).ambiguousAuthorizations(); +boolean ambiguousAuths = WalkingSecurity.get(state).ambiguousAuthorizations(conn.whoami()); try { Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(conn.whoami())); Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java?rev=1451768r1=1451767r2=1451768view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Fri Mar 1 23:25:01 2013 @@ -122,7 +122,7 @@ public class WalkingSecurity extends Sec return (Authorizations) state.get(user + _auths); } - public boolean ambiguousAuthorizations() { + public boolean ambiguousAuthorizations(String userName) { Long setTime = state.getLong(Auths- + userName + '-' + time); if (setTime == null) throw new RuntimeException(WTF? Auths- + userName + '-' + time is null);
svn commit: r1451770 - in /accumulo/trunk: ./ test/src/main/java/org/apache/accumulo/test/randomwalk/security/
Author: vines Date: Fri Mar 1 23:26:02 2013 New Revision: 1451770 URL: http://svn.apache.org/r1451770 Log: ACCUMULO-1123 - Had compensation for propogation times for uncached permissions. Authorizations and passwords didn't have the luxury. Added in transient state for authorizations and a pause for ChangePass to help compensate. Ideally, there would be compensation throughout the code for the password, but the code has already become a bit of a rats nest. WalkingSecurity helped clean it up tremendously, I should rewrite a lot of the states now that that exists to make it simpler. Modified: accumulo/trunk/ (props changed) accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451718-1451761,1451763-1451768 Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java?rev=1451770r1=1451769r2=1451770view=diff == --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java Fri Mar 1 23:26:02 2013 @@ -81,6 +81,8 @@ public class ChangePass extends Test { } } WalkingSecurity.get(state).changePassword(target, newPass); +// Waiting 1 second for password to propogate through Zk +Thread.sleep(1000); if (!hasPerm) throw new AccumuloException(Password change succeeded when it should have failed for + source + changing the password for + target + .); } Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java?rev=1451770r1=1451769r2=1451770view=diff == --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java Fri Mar 1 23:26:02 2013 @@ -72,6 +72,7 @@ public class TableOp extends Test { boolean canRead = WalkingSecurity.get(state).canScan(WalkingSecurity.get(state).getTabCredentials(), tableName); Authorizations auths = WalkingSecurity.get(state).getUserAuthorizations(WalkingSecurity.get(state).getTabCredentials()); boolean ambiguousZone = WalkingSecurity.get(state).inAmbiguousZone(conn.whoami(), tp); +boolean ambiguousAuths = WalkingSecurity.get(state).ambiguousAuthorizations(conn.whoami()); try { Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(conn.whoami())); @@ -81,7 +82,7 @@ public class TableOp extends Test { EntryKey,Value entry = iter.next(); Key k = entry.getKey(); seen++; -if (!auths.contains(k.getColumnVisibilityData())) +if (!auths.contains(k.getColumnVisibilityData()) !ambiguousAuths) throw new AccumuloException(Got data I should not be capable of seeing: + k + table + tableName); } if (!canRead !ambiguousZone) @@ -90,7 +91,7 @@ public class TableOp extends Test { if (auths.contains(entry.getKey().getBytes())) seen = seen - entry.getValue(); } - if (seen != 0) + if (seen != 0 !ambiguousAuths) throw new AccumuloException(Got mismatched amounts of data); } catch (TableNotFoundException tnfe) { if (tableExists) @@ -103,6 +104,12 @@ public class TableOp extends Test { else return; } + if (ae.getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) { +if (ambiguousAuths) + return; +else + throw new AccumuloException(Mismatched authorizations! , ae); + } throw new AccumuloException(Unexpected exception!, ae); } catch (RuntimeException re) { if (re.getCause() instanceof AccumuloSecurityException @@ -112,6 +119,14 @@ public class TableOp extends Test { else return; } + if (re.getCause() instanceof AccumuloSecurityException + ((AccumuloSecurityException)
svn commit: r1451773 - in /accumulo/trunk: ./ test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Author: vines Date: Fri Mar 1 23:31:39 2013 New Revision: 1451773 URL: http://svn.apache.org/r1451773 Log: ACCUMULO-1123 - pay no mind to the man behind the curtain Modified: accumulo/trunk/ (props changed) accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451769-1451771 Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java?rev=1451773r1=1451772r2=1451773view=diff == --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Fri Mar 1 23:31:39 2013 @@ -115,6 +115,7 @@ public class WalkingSecurity extends Sec @Override public void changeAuthorizations(String user, Authorizations authorizations) throws AccumuloSecurityException { state.set(user + _auths, authorizations); +state.set(Auths- + user + '-' + time, System.currentTimeMillis()); } @Override
svn commit: r1451791 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
Author: kturner Date: Sat Mar 2 00:33:00 2013 New Revision: 1451791 URL: http://svn.apache.org/r1451791 Log: ACCUMULO-1118 fixed upgrade test script, seems that test and verify ingest now require a username and password Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) accumulo/trunk/test/system/upgrade_test.sh Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1451772-1451790 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451761,1451763-1451790 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451761,1451763-1451790 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451761,1451763-1451790 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451761,1451763-1451790 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451761,1451763-1451790 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1451718-1451761,1451763-1451790 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.5/src:r1451517-1451606,1451608-1451639,1451641-1451663,1451666-1451699,1451702-1451761,1451763-1451790 Modified: accumulo/trunk/test/system/upgrade_test.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/upgrade_test.sh?rev=1451791r1=1451790r2=1451791view=diff == --- accumulo/trunk/test/system/upgrade_test.sh (original) +++ accumulo/trunk/test/system/upgrade_test.sh Sat Mar 2 00:33:00 2013 @@ -32,7 +32,7 @@ ONE_FOUR_DIR=../../../accumulo-1.4 ONE_FIVE_DIR=../../ pkill -f accumulo.start -hadoop fs -rmr /accumulo +hadoop fs -rmr /accumulo-1.4 hadoop fs -rmr /testmf hadoop fs -rmr /testmfFail @@ -52,23 +52,23 @@ echo Starting 1.5 === $ONE_FIVE_DIR/bin/start-all.sh -$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 20 --start 0 --cols 1 +$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 20 --start 0 --cols 1 -u root -p secret echo compact -t test_ingest -w | $ONE_FIVE_DIR/bin/accumulo shell -u root -p secret -$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 20 --start 0 --cols 1 +$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 20 --start 0 --cols 1 -u root -p secret #test overwriting data writting in 1.4 -$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 30 --start 0 --cols 1 -cv L1L2G1GROUP2 -$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 30 --start 0 --cols 1 +$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 30 --start 0 --cols 1 -cv L1L2G1GROUP2 -u root -p secret +$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 30 --start 0 --cols 1 -u root -p secret echo compact -t test_ingest -w | $ONE_FIVE_DIR/bin/accumulo shell -u root -p secret -$ONE_FIVE_DIR/bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50