minor fix to image_to_live.sh.

1. the dev server running with python 2.6 now, not python.
2. I dont fully understand why we need sudo inside this script. So I am removing it. Since I could not enter sudo password inside crontab. Please let me know if I missed anything and I could revert.

[kmixter1, 2010-03-03 21:44:32]

I'm not sure why the python in your chroot has a different argv[0]
(python2.6 vs python).  I know that it's not happening for me at head.
 Do you have a non-standard chroot?  The new pkill command that you're
proposing isn't going to kill my dev server.  Perhaps you need both.

Removing sudo is ok.

What additional output from start-devserver were you trying to see?  I
purposefully didn't want to see any of its output.  Note that the
progress of the download is shown without this change.

On Wed, Mar 3, 2010 at 12:57 PM,  <ericli@chromium.org> wrote:
> Reviewers: kmixter1,
>
> Description:
> 1. the dev server running with python 2.6 now, not python.
> 2. I dont fully understand why we need sudo inside this script. So I am
> removing
> it. Since I could not enter sudo password inside crontab. Please let me know
> if
> I missed anything and I could revert.
>
> Please review this at http://codereview.chromium.org/666002
>
> Affected files:
>  M src/scripts/image_to_live.sh
>
>
> Index: src/scripts/image_to_live.sh
> diff --git a/src/scripts/image_to_live.sh b/src/scripts/image_to_live.sh
> index
>
4930d971af0f0e16f783edf02bffb840d7202139..bfd979f6ed4214d9a62f73dc5140c4b8de94db69
> 100755
> --- a/src/scripts/image_to_live.sh
> +++ b/src/scripts/image_to_live.sh
> @@ -22,7 +22,7 @@ DEFINE_boolean update_known_hosts ${FLAGS_FALSE} \
>  function kill_all_devservers {
>   # Using ! here to avoid exiting with set -e is insufficient, so use
>   # || true instead.
> -  pkill -f 'python devserver.py' || true
> +  pkill -f 'python2.6 devserver.py' || true
>  }
>
>  function cleanup {
> @@ -37,8 +37,7 @@ function remote_reboot_sh {
>
>  function start_dev_server {
>   kill_all_devservers
> -  sudo -v
> -  ./enter_chroot.sh "cd ../platform/dev; ./start-devserver.sh>/dev/null
> 2>&1" &
> +  ./enter_chroot.sh "cd ../platform/dev; ./start-devserver.sh 2>&1" &
>   echo -n "Waiting on devserver to start"
>   until netstat -anp 2>&1 | grep 8080 > /dev/null; do
>     sleep .5
> @@ -111,7 +110,7 @@ function run_auto_update {
>     # Sleep for a while so that ssh handling doesn't slow down the install
>     sleep 2
>   done
> -
> +
>   return ${update_error}
>  }
>
>
>
>

[ericli, 2010-03-03 21:50:27]

On Wed, Mar 3, 2010 at 1:44 PM, Ken Mixter <kmixter@chromium.org> wrote:

> I'm not sure why the python in your chroot has a different argv[0]
> (python2.6 vs python).  I know that it's not happening for me at head.
>  Do you have a non-standard chroot?  The new pkill command that you're
> proposing isn't going to kill my dev server.  Perhaps you need both.
>
> I need to look at this. Not sure what happened.


> Removing sudo is ok.
>
> What additional output from start-devserver were you trying to see?  I
> purposefully didn't want to see any of its output.  Note that the
> progress of the download is shown without this change.
>
> It will be good for troubleshooting. I got couple of update not sucess or
no update available errors before and the only way to figure out what is
going on is to see the dev server output.



> On Wed, Mar 3, 2010 at 12:57 PM,  <ericli@chromium.org> wrote:
> > Reviewers: kmixter1,
> >
> > Description:
> > 1. the dev server running with python 2.6 now, not python.
> > 2. I dont fully understand why we need sudo inside this script. So I am
> > removing
> > it. Since I could not enter sudo password inside crontab. Please let me
> know
> > if
> > I missed anything and I could revert.
> >
> > Please review this at http://codereview.chromium.org/666002
> >
> > Affected files:
> >  M src/scripts/image_to_live.sh
> >
> >
> > Index: src/scripts/image_to_live.sh
> > diff --git a/src/scripts/image_to_live.sh b/src/scripts/image_to_live.sh
> > index
> >
>
4930d971af0f0e16f783edf02bffb840d7202139..bfd979f6ed4214d9a62f73dc5140c4b8de94db69
> > 100755
> > --- a/src/scripts/image_to_live.sh
> > +++ b/src/scripts/image_to_live.sh
> > @@ -22,7 +22,7 @@ DEFINE_boolean update_known_hosts ${FLAGS_FALSE} \
> >  function kill_all_devservers {
> >   # Using ! here to avoid exiting with set -e is insufficient, so use
> >   # || true instead.
> > -  pkill -f 'python devserver.py' || true
> > +  pkill -f 'python2.6 devserver.py' || true
> >  }
> >
> >  function cleanup {
> > @@ -37,8 +37,7 @@ function remote_reboot_sh {
> >
> >  function start_dev_server {
> >   kill_all_devservers
> > -  sudo -v
> > -  ./enter_chroot.sh "cd ../platform/dev; ./start-devserver.sh>/dev/null
> > 2>&1" &
> > +  ./enter_chroot.sh "cd ../platform/dev; ./start-devserver.sh 2>&1" &
> >   echo -n "Waiting on devserver to start"
> >   until netstat -anp 2>&1 | grep 8080 > /dev/null; do
> >     sleep .5
> > @@ -111,7 +110,7 @@ function run_auto_update {
> >     # Sleep for a while so that ssh handling doesn't slow down the
> install
> >     sleep 2
> >   done
> > -
> > +
> >   return ${update_error}
> >  }
> >
> >
> >
> >
>



-- 
Eric Li
李咏竹
Google Kirkland

[ericli, 2010-03-04 19:46:19]

I had updated the way to kill devserver, I believe it works for both python and
python2.6 now.

I still dont know why the difference through. I will pretend to ignore that for
now.

[kmixter1, 2010-03-05 00:41:15]

LGTM

http://codereview.chromium.org/666002/diff/3002/2002
File src/scripts/image_to_live.sh (right):

http://codereview.chromium.org/666002/diff/3002/2002#newcode29
src/scripts/image_to_live.sh:29: echo Stop and kill dev server.
how about: echo "Killing dev server."

http://codereview.chromium.org/666002/diff/3002/2002#newcode126
src/scripts/image_to_live.sh:126: # This may fail while the machine is done so
generate output and a
s/done/down/  (sorry my typo)

[ericli, 2010-03-05 19:15:04]

Fixed. and pushing...

On 2010/03/05 00:41:15, kmixter1 wrote:
> LGTM
> 
> http://codereview.chromium.org/666002/diff/3002/2002
> File src/scripts/image_to_live.sh (right):
> 
> http://codereview.chromium.org/666002/diff/3002/2002#newcode29
> src/scripts/image_to_live.sh:29: echo Stop and kill dev server.
> how about: echo "Killing dev server."
> 
> http://codereview.chromium.org/666002/diff/3002/2002#newcode126
> src/scripts/image_to_live.sh:126: # This may fail while the machine is done so
> generate output and a
> s/done/down/  (sorry my typo)