You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gu...@apache.org on 2015/11/02 23:09:01 UTC
kafka git commit: KAFKA-2726: Fix port collision between ntpdate and
ntp daemon
Repository: kafka
Updated Branches:
refs/heads/trunk 758272267 -> 1f5d05fe7
KAFKA-2726: Fix port collision between ntpdate and ntp daemon
gwenshap Can you take a quick look? I have verified the change allows successful `vagrant provision` even with ntp daemon already running on the vm.
Author: Geoff Anderson <ge...@confluent.io>
Reviewers: Guozhang Wang
Closes #407 from granders/KAFKA-2726-ntp-port-collision
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/1f5d05fe
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/1f5d05fe
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/1f5d05fe
Branch: refs/heads/trunk
Commit: 1f5d05fe718b7db7ee07c727b7a736fab09322d6
Parents: 7582722
Author: Geoff Anderson <ge...@confluent.io>
Authored: Mon Nov 2 14:14:38 2015 -0800
Committer: Guozhang Wang <wa...@gmail.com>
Committed: Mon Nov 2 14:14:38 2015 -0800
----------------------------------------------------------------------
vagrant/base.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/1f5d05fe/vagrant/base.sh
----------------------------------------------------------------------
diff --git a/vagrant/base.sh b/vagrant/base.sh
index 08b38ae..8e1e1c6 100644
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -74,6 +74,7 @@ fi
chmod a+rwx /mnt
# Run ntpdate once to sync to ntp servers
-ntpdate pool.ntp.org
+# use -u option to avoid port collision in case ntp daemon is already running
+ntpdate -u pool.ntp.org
# Install ntp daemon - it will automatically start on boot
apt-get -y install ntp